2007-08-13 03:30:14

by Scott Thompson

[permalink] [raw]
Subject: [PATCH ] /drivers/ata ioremap returncode check (pata_ixp4xx_cf.c)

patch against 2.6.23-rc2. this corrects two missing ioremap return
checks.

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..eaebc4d 100644
--- a/drivers/ata/pata_ixp4xx_cf.c
+++ b/drivers/ata/pata_ixp4xx_cf.c
@@ -189,6 +189,14 @@ 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) {
+ if (data->cs0)
+ iounmap(data->cs0);
+ if (data->cs1)
+ iounmap(data->cs1);
+ return -ENOMEM;
+ }
+
irq = platform_get_irq(pdev, 0);
if (irq)
set_irq_type(irq, IRQT_RISING);