Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

[linux-2.6-omap-h63xx.git] / drivers / usb / host / isp1760-if.c

diff --git a/drivers/usb/host/isp1760-if.c b/drivers/usb/host/isp1760-if.c
index 051ef7b6bdc640f99e0e17f2079b3929e73cab6f..af849f596135324bf727ac667f7f2d4cbc7d9920 100644 (file)
--- a/drivers/usb/host/isp1760-if.c
+++ b/drivers/usb/host/isp1760-if.c
@@ -218,7 +218,7 @@ static int __devinit isp1761_pci_probe(struct pci_dev *dev,
         * and reading back and checking the contents are same or not
         */
        if (reg_data != 0xFACE) {
-               err("scratch register mismatch %x", reg_data);
+               dev_err(&dev->dev, "scratch register mismatch %x\n", reg_data);
                goto clean;
        }
 
@@ -232,9 +232,10 @@ static int __devinit isp1761_pci_probe(struct pci_dev *dev,
        hcd = isp1760_register(pci_mem_phy0, length, dev->irq,
                IRQF_SHARED | IRQF_DISABLED, &dev->dev, dev_name(&dev->dev),
                devflags);
-       pci_set_drvdata(dev, hcd);
-       if (!hcd)
+       if (!IS_ERR(hcd)) {
+               pci_set_drvdata(dev, hcd);
                return 0;
+       }
 clean:
        status = -ENODEV;
        iounmap(iobase);