mfd: Add power control platform data to SDHI driver

[safe/jmp/linux-2.6] / drivers / scsi / zalon.c

diff --git a/drivers/scsi/zalon.c b/drivers/scsi/zalon.c
index 3c4a300..27e84e4 100644 (file)
--- a/drivers/scsi/zalon.c
+++ b/drivers/scsi/zalon.c
@@ -134,11 +134,11 @@ zalon_probe(struct parisc_device *dev)
 
        host = ncr_attach(&zalon7xx_template, unit, &device);
        if (!host)
-               goto fail;
+               return -ENODEV;
 
        if (request_irq(dev->irq, ncr53c8xx_intr, IRQF_SHARED, "zalon", host)) {
-               printk(KERN_ERR "%s: irq problem with %d, detaching\n ",
-                       dev->dev.bus_id, dev->irq);
+         dev_printk(KERN_ERR, &dev->dev, "irq problem with %d, detaching\n ",
+                    dev->irq);
                goto fail;
        }