[PATCH resubmit] /drivers/ata ioremap returncode check

Previous thread: [patch 0/2] s390 related scheduler patches and questions by Christian Borntraeger on Thursday, August 23, 2007 - 12:26 pm. (4 messages)

Next thread: "double" hpet clocksource && hard freeze [bisected] by Paolo Ornati on Thursday, August 23, 2007 - 1:21 pm. (18 messages)
From: Scott Thompson
Date: Thursday, August 23, 2007 - 12:34 pm

Patchset against 2.6.23-rc3.  corrects missing ioremap return 
checks, resending after fixing for documentation making changes suggested...

As for suggestions, I did fix the {} that weren't needed.  I did not add in a
"printk" err or warn statement as the rest of the module does not contain these
messages.  When auditing (as I am for ioremap checking here) I am attempting
to keep changes "in the style of their surroundings".  Otherwise it's massive
scope screep on these patches.
 
Signed-off-by: Scott Thompson <postfail <at> hushmail.com>
---------------------------------------------------------------
diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c
index 4ca7fd6..6f9a2b7 100644
--- a/drivers/ata/pata_ixp4xx_cf.c
+++ b/drivers/ata/pata_ixp4xx_cf.c
@@ -189,6 +189,9 @@ static __devinit int ixp4xx_pata_probe(struct platform_device *pdev)
 	data->cs0 = devm_ioremap(&pdev->dev, cs0->start, 0x1000);
 	data->cs1 = devm_ioremap(&pdev->dev, cs1->start, 0x1000);
 
+	if (!data->cs0 || !data->cs1) 
+		return -ENOMEM;
+	
 	irq = platform_get_irq(pdev, 0);
 	if (irq)
 		set_irq_type(irq, IRQT_RISING);


       
____________________________________________________________________________________
Moody friends. Drama queens. Your life? Nope! - their life, your story. Play Sims Stories at
Yahoo! Games.
http://sims.yahoo.com/  


       
____________________________________________________________________________________
Looking for a deal? Find great prices on flights and hotels with Yahoo! FareChase.
http://farechase.yahoo.com/

-

From: Tejun Heo
Date: Monday, September 3, 2007 - 1:29 am

Acked-by: Tejun Heo <htejun@gmail.com>

It would be better to start the subject line with pata_ixp4xx_cf: but
maybe Jeff can fix it up while applying.

Thanks.

-- 
tejun
-

Previous thread: [patch 0/2] s390 related scheduler patches and questions by Christian Borntraeger on Thursday, August 23, 2007 - 12:26 pm. (4 messages)

Next thread: "double" hpet clocksource && hard freeze [bisected] by Paolo Ornati on Thursday, August 23, 2007 - 1:21 pm. (18 messages)