Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6-omap-h63xx.git] / drivers / usb / gadget / amd5536udc.c

diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c
index ce337cb5d13706a763b42193adf872efe38b309b..f261d2a9a5f00bafd2e02f6cb4b119378773c04a 100644 (file)
--- a/drivers/usb/gadget/amd5536udc.c
+++ b/drivers/usb/gadget/amd5536udc.c
@@ -3251,7 +3251,7 @@ static int udc_pci_probe(
        /* pci setup */
        if (pci_enable_device(pdev) < 0) {
                kfree(dev);
-               dev = 0;
+               dev = NULL;
                retval = -ENODEV;
                goto finished;
        }
@@ -3264,7 +3264,7 @@ static int udc_pci_probe(
        if (!request_mem_region(resource, len, name)) {
                dev_dbg(&pdev->dev, "pci device used already\n");
                kfree(dev);
-               dev = 0;
+               dev = NULL;
                retval = -EBUSY;
                goto finished;
        }
@@ -3274,7 +3274,7 @@ static int udc_pci_probe(
        if (dev->virt_addr == NULL) {
                dev_dbg(&pdev->dev, "start address cannot be mapped\n");
                kfree(dev);
-               dev = 0;
+               dev = NULL;
                retval = -EFAULT;
                goto finished;
        }
@@ -3282,7 +3282,7 @@ static int udc_pci_probe(
        if (!pdev->irq) {
                dev_err(&dev->pdev->dev, "irq not set\n");
                kfree(dev);
-               dev = 0;
+               dev = NULL;
                retval = -ENODEV;
                goto finished;
        }
@@ -3290,7 +3290,7 @@ static int udc_pci_probe(
        if (request_irq(pdev->irq, udc_irq, IRQF_SHARED, name, dev) != 0) {
                dev_dbg(&dev->pdev->dev, "request_irq(%d) fail\n", pdev->irq);
                kfree(dev);
-               dev = 0;
+               dev = NULL;
                retval = -EBUSY;
                goto finished;
        }