diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2013-06-26 23:08:22 -0700 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-06-26 23:08:22 -0700 |
| commit | a9e94ec3504ead4b87a929bc57f5aa99a6590437 (patch) | |
| tree | b6e7aaec0e844dc066e93296a85e5769542ef525 /drivers/usb/gadget/s3c2410_udc.c | |
| parent | 36a279686bc02d340eb213a9f2a0b67e50de64b4 (diff) | |
| parent | 2884d4230867c8a46cf701214051e923301e7429 (diff) | |
Merge tag 'fcoe1' into fixes
This patch fixes a critical bug that was introduced in 3.9
related to VLAN tagging FCoE frames.
Diffstat (limited to 'drivers/usb/gadget/s3c2410_udc.c')
| -rw-r--r-- | drivers/usb/gadget/s3c2410_udc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c index d0e75e1b3ccb..09c4f70c93c4 100644 --- a/drivers/usb/gadget/s3c2410_udc.c +++ b/drivers/usb/gadget/s3c2410_udc.c @@ -1851,6 +1851,7 @@ static int s3c2410_udc_probe(struct platform_device *pdev) irq = gpio_to_irq(udc_info->vbus_pin); if (irq < 0) { dev_err(dev, "no irq for gpio vbus pin\n"); + retval = irq; goto err_gpio_claim; } @@ -1948,8 +1949,6 @@ static int s3c2410_udc_remove(struct platform_device *pdev) iounmap(base_addr); release_mem_region(rsrc_start, rsrc_len); - platform_set_drvdata(pdev, NULL); - if (!IS_ERR(udc_clock) && udc_clock != NULL) { clk_disable(udc_clock); clk_put(udc_clock); |