Commit ea5301aa authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Merge tag 'fixes-for-v3.9-rc2' of...

Merge tag 'fixes-for-v3.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus

Felipe writes:

"usb: fixes for v3.9-rc2

A few drivers got their gadget->dev registration problems
exposed by the removal of ->start()/->stop() functions from
udc-core.c. All of such instances are now fixed.

We're also fixing chipidea's mistake of registering private
debugging sysfs files under the gadget's device. This is
in preparation to complete removal of gadget->dev handling
from all UDC drivers which will happen for v3.10 merge window.

MUSB's Kconfig got a fix to avoid a non-buildable selection
of its Kconfig choices.

Some extra devm_ioremap_resource() are added here because they
missed the merge window.

Finally, we have a temporary fix linking function drivers
before gadget drivers so they work fine when they're statically
linked to the kernel. We've done it so since the real fix wouldn't
fit the -rc cycle."
parents 6dbe51c2 29240e23
...@@ -1767,7 +1767,7 @@ static int udc_start(struct ci13xxx *ci) ...@@ -1767,7 +1767,7 @@ static int udc_start(struct ci13xxx *ci)
goto put_transceiver; goto put_transceiver;
} }
retval = dbg_create_files(&ci->gadget.dev); retval = dbg_create_files(ci->dev);
if (retval) if (retval)
goto unreg_device; goto unreg_device;
...@@ -1796,7 +1796,7 @@ static int udc_start(struct ci13xxx *ci) ...@@ -1796,7 +1796,7 @@ static int udc_start(struct ci13xxx *ci)
dev_err(dev, "error = %i\n", retval); dev_err(dev, "error = %i\n", retval);
remove_dbg: remove_dbg:
dbg_remove_files(&ci->gadget.dev); dbg_remove_files(ci->dev);
unreg_device: unreg_device:
device_unregister(&ci->gadget.dev); device_unregister(&ci->gadget.dev);
put_transceiver: put_transceiver:
...@@ -1836,7 +1836,7 @@ static void udc_stop(struct ci13xxx *ci) ...@@ -1836,7 +1836,7 @@ static void udc_stop(struct ci13xxx *ci)
if (ci->global_phy) if (ci->global_phy)
usb_put_phy(ci->transceiver); usb_put_phy(ci->transceiver);
} }
dbg_remove_files(&ci->gadget.dev); dbg_remove_files(ci->dev);
device_unregister(&ci->gadget.dev); device_unregister(&ci->gadget.dev);
/* my kobject is dynamic, I swear! */ /* my kobject is dynamic, I swear! */
memset(&ci->gadget, 0, sizeof(ci->gadget)); memset(&ci->gadget, 0, sizeof(ci->gadget));
......
...@@ -583,6 +583,7 @@ static int dwc3_remove(struct platform_device *pdev) ...@@ -583,6 +583,7 @@ static int dwc3_remove(struct platform_device *pdev)
break; break;
} }
dwc3_free_event_buffers(dwc);
dwc3_core_exit(dwc); dwc3_core_exit(dwc);
return 0; return 0;
......
...@@ -23,8 +23,6 @@ ...@@ -23,8 +23,6 @@
#include <linux/usb/nop-usb-xceiv.h> #include <linux/usb/nop-usb-xceiv.h>
#include <linux/of.h> #include <linux/of.h>
#include "core.h"
struct dwc3_exynos { struct dwc3_exynos {
struct platform_device *dwc3; struct platform_device *dwc3;
struct platform_device *usb2_phy; struct platform_device *usb2_phy;
......
...@@ -54,8 +54,6 @@ ...@@ -54,8 +54,6 @@
#include <linux/usb/otg.h> #include <linux/usb/otg.h>
#include <linux/usb/nop-usb-xceiv.h> #include <linux/usb/nop-usb-xceiv.h>
#include "core.h"
/* /*
* All these registers belong to OMAP's Wrapper around the * All these registers belong to OMAP's Wrapper around the
* DesignWare USB3 Core. * DesignWare USB3 Core.
...@@ -465,20 +463,20 @@ static int dwc3_omap_remove(struct platform_device *pdev) ...@@ -465,20 +463,20 @@ static int dwc3_omap_remove(struct platform_device *pdev)
return 0; return 0;
} }
static const struct of_device_id of_dwc3_matach[] = { static const struct of_device_id of_dwc3_match[] = {
{ {
"ti,dwc3", "ti,dwc3",
}, },
{ }, { },
}; };
MODULE_DEVICE_TABLE(of, of_dwc3_matach); MODULE_DEVICE_TABLE(of, of_dwc3_match);
static struct platform_driver dwc3_omap_driver = { static struct platform_driver dwc3_omap_driver = {
.probe = dwc3_omap_probe, .probe = dwc3_omap_probe,
.remove = dwc3_omap_remove, .remove = dwc3_omap_remove,
.driver = { .driver = {
.name = "omap-dwc3", .name = "omap-dwc3",
.of_match_table = of_dwc3_matach, .of_match_table = of_dwc3_match,
}, },
}; };
......
...@@ -45,8 +45,6 @@ ...@@ -45,8 +45,6 @@
#include <linux/usb/otg.h> #include <linux/usb/otg.h>
#include <linux/usb/nop-usb-xceiv.h> #include <linux/usb/nop-usb-xceiv.h>
#include "core.h"
/* FIXME define these in <linux/pci_ids.h> */ /* FIXME define these in <linux/pci_ids.h> */
#define PCI_VENDOR_ID_SYNOPSYS 0x16c3 #define PCI_VENDOR_ID_SYNOPSYS 0x16c3
#define PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3 0xabcd #define PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3 0xabcd
......
...@@ -2159,7 +2159,6 @@ static void dwc3_gadget_phy_suspend(struct dwc3 *dwc, u8 speed) ...@@ -2159,7 +2159,6 @@ static void dwc3_gadget_phy_suspend(struct dwc3 *dwc, u8 speed)
static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc) static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc)
{ {
struct dwc3_gadget_ep_cmd_params params;
struct dwc3_ep *dep; struct dwc3_ep *dep;
int ret; int ret;
u32 reg; u32 reg;
...@@ -2167,8 +2166,6 @@ static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc) ...@@ -2167,8 +2166,6 @@ static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc)
dev_vdbg(dwc->dev, "%s\n", __func__); dev_vdbg(dwc->dev, "%s\n", __func__);
memset(&params, 0x00, sizeof(params));
reg = dwc3_readl(dwc->regs, DWC3_DSTS); reg = dwc3_readl(dwc->regs, DWC3_DSTS);
speed = reg & DWC3_DSTS_CONNECTSPD; speed = reg & DWC3_DSTS_CONNECTSPD;
dwc->speed = speed; dwc->speed = speed;
......
...@@ -35,6 +35,12 @@ mv_udc-y := mv_udc_core.o ...@@ -35,6 +35,12 @@ mv_udc-y := mv_udc_core.o
obj-$(CONFIG_USB_FUSB300) += fusb300_udc.o obj-$(CONFIG_USB_FUSB300) += fusb300_udc.o
obj-$(CONFIG_USB_MV_U3D) += mv_u3d_core.o obj-$(CONFIG_USB_MV_U3D) += mv_u3d_core.o
# USB Functions
obj-$(CONFIG_USB_F_ACM) += f_acm.o
f_ss_lb-y := f_loopback.o f_sourcesink.o
obj-$(CONFIG_USB_F_SS_LB) += f_ss_lb.o
obj-$(CONFIG_USB_U_SERIAL) += u_serial.o
# #
# USB gadget drivers # USB gadget drivers
# #
...@@ -74,9 +80,3 @@ obj-$(CONFIG_USB_G_WEBCAM) += g_webcam.o ...@@ -74,9 +80,3 @@ obj-$(CONFIG_USB_G_WEBCAM) += g_webcam.o
obj-$(CONFIG_USB_G_NCM) += g_ncm.o obj-$(CONFIG_USB_G_NCM) += g_ncm.o
obj-$(CONFIG_USB_G_ACM_MS) += g_acm_ms.o obj-$(CONFIG_USB_G_ACM_MS) += g_acm_ms.o
obj-$(CONFIG_USB_GADGET_TARGET) += tcm_usb_gadget.o obj-$(CONFIG_USB_GADGET_TARGET) += tcm_usb_gadget.o
# USB Functions
obj-$(CONFIG_USB_F_ACM) += f_acm.o
f_ss_lb-y := f_loopback.o f_sourcesink.o
obj-$(CONFIG_USB_F_SS_LB) += f_ss_lb.o
obj-$(CONFIG_USB_U_SERIAL) += u_serial.o
...@@ -418,6 +418,7 @@ static int audio_get_intf_req(struct usb_function *f, ...@@ -418,6 +418,7 @@ static int audio_get_intf_req(struct usb_function *f,
req->context = audio; req->context = audio;
req->complete = f_audio_complete; req->complete = f_audio_complete;
len = min_t(size_t, sizeof(value), len);
memcpy(req->buf, &value, len); memcpy(req->buf, &value, len);
return len; return len;
......
...@@ -1334,27 +1334,18 @@ static int imx_udc_start(struct usb_gadget *gadget, ...@@ -1334,27 +1334,18 @@ static int imx_udc_start(struct usb_gadget *gadget,
struct usb_gadget_driver *driver) struct usb_gadget_driver *driver)
{ {
struct imx_udc_struct *imx_usb; struct imx_udc_struct *imx_usb;
int retval;
imx_usb = container_of(gadget, struct imx_udc_struct, gadget); imx_usb = container_of(gadget, struct imx_udc_struct, gadget);
/* first hook up the driver ... */ /* first hook up the driver ... */
imx_usb->driver = driver; imx_usb->driver = driver;
imx_usb->gadget.dev.driver = &driver->driver; imx_usb->gadget.dev.driver = &driver->driver;
retval = device_add(&imx_usb->gadget.dev);
if (retval)
goto fail;
D_INI(imx_usb->dev, "<%s> registered gadget driver '%s'\n", D_INI(imx_usb->dev, "<%s> registered gadget driver '%s'\n",
__func__, driver->driver.name); __func__, driver->driver.name);
imx_udc_enable(imx_usb); imx_udc_enable(imx_usb);
return 0; return 0;
fail:
imx_usb->driver = NULL;
imx_usb->gadget.dev.driver = NULL;
return retval;
} }
static int imx_udc_stop(struct usb_gadget *gadget, static int imx_udc_stop(struct usb_gadget *gadget,
...@@ -1370,8 +1361,6 @@ static int imx_udc_stop(struct usb_gadget *gadget, ...@@ -1370,8 +1361,6 @@ static int imx_udc_stop(struct usb_gadget *gadget,
imx_usb->gadget.dev.driver = NULL; imx_usb->gadget.dev.driver = NULL;
imx_usb->driver = NULL; imx_usb->driver = NULL;
device_del(&imx_usb->gadget.dev);
D_INI(imx_usb->dev, "<%s> unregistered gadget driver '%s'\n", D_INI(imx_usb->dev, "<%s> unregistered gadget driver '%s'\n",
__func__, driver->driver.name); __func__, driver->driver.name);
...@@ -1477,6 +1466,10 @@ static int __init imx_udc_probe(struct platform_device *pdev) ...@@ -1477,6 +1466,10 @@ static int __init imx_udc_probe(struct platform_device *pdev)
imx_usb->gadget.dev.parent = &pdev->dev; imx_usb->gadget.dev.parent = &pdev->dev;
imx_usb->gadget.dev.dma_mask = pdev->dev.dma_mask; imx_usb->gadget.dev.dma_mask = pdev->dev.dma_mask;
ret = device_add(&imx_usb->gadget.dev);
if (retval)
goto fail4;
platform_set_drvdata(pdev, imx_usb); platform_set_drvdata(pdev, imx_usb);
usb_init_data(imx_usb); usb_init_data(imx_usb);
...@@ -1488,9 +1481,11 @@ static int __init imx_udc_probe(struct platform_device *pdev) ...@@ -1488,9 +1481,11 @@ static int __init imx_udc_probe(struct platform_device *pdev)
ret = usb_add_gadget_udc(&pdev->dev, &imx_usb->gadget); ret = usb_add_gadget_udc(&pdev->dev, &imx_usb->gadget);
if (ret) if (ret)
goto fail4; goto fail5;
return 0; return 0;
fail5:
device_unregister(&imx_usb->gadget.dev);
fail4: fail4:
for (i = 0; i < IMX_USB_NB_EP + 1; i++) for (i = 0; i < IMX_USB_NB_EP + 1; i++)
free_irq(imx_usb->usbd_int[i], imx_usb); free_irq(imx_usb->usbd_int[i], imx_usb);
...@@ -1514,6 +1509,7 @@ static int __exit imx_udc_remove(struct platform_device *pdev) ...@@ -1514,6 +1509,7 @@ static int __exit imx_udc_remove(struct platform_device *pdev)
int i; int i;
usb_del_gadget_udc(&imx_usb->gadget); usb_del_gadget_udc(&imx_usb->gadget);
device_unregister(&imx_usb->gadget.dev);
imx_udc_disable(imx_usb); imx_udc_disable(imx_usb);
del_timer(&imx_usb->timer); del_timer(&imx_usb->timer);
......
...@@ -1266,13 +1266,6 @@ static int pxa25x_udc_start(struct usb_gadget *g, ...@@ -1266,13 +1266,6 @@ static int pxa25x_udc_start(struct usb_gadget *g,
dev->gadget.dev.driver = &driver->driver; dev->gadget.dev.driver = &driver->driver;
dev->pullup = 1; dev->pullup = 1;
retval = device_add (&dev->gadget.dev);
if (retval) {
dev->driver = NULL;
dev->gadget.dev.driver = NULL;
return retval;
}
/* ... then enable host detection and ep0; and we're ready /* ... then enable host detection and ep0; and we're ready
* for set_configuration as well as eventual disconnect. * for set_configuration as well as eventual disconnect.
*/ */
...@@ -1331,7 +1324,6 @@ static int pxa25x_udc_stop(struct usb_gadget*g, ...@@ -1331,7 +1324,6 @@ static int pxa25x_udc_stop(struct usb_gadget*g,
dev->gadget.dev.driver = NULL; dev->gadget.dev.driver = NULL;
dev->driver = NULL; dev->driver = NULL;
device_del (&dev->gadget.dev);
dump_state(dev); dump_state(dev);
return 0; return 0;
...@@ -2146,6 +2138,13 @@ static int __init pxa25x_udc_probe(struct platform_device *pdev) ...@@ -2146,6 +2138,13 @@ static int __init pxa25x_udc_probe(struct platform_device *pdev)
dev->gadget.dev.parent = &pdev->dev; dev->gadget.dev.parent = &pdev->dev;
dev->gadget.dev.dma_mask = pdev->dev.dma_mask; dev->gadget.dev.dma_mask = pdev->dev.dma_mask;
retval = device_add(&dev->gadget.dev);
if (retval) {
dev->driver = NULL;
dev->gadget.dev.driver = NULL;
goto err_device_add;
}
the_controller = dev; the_controller = dev;
platform_set_drvdata(pdev, dev); platform_set_drvdata(pdev, dev);
...@@ -2196,6 +2195,8 @@ static int __init pxa25x_udc_probe(struct platform_device *pdev) ...@@ -2196,6 +2195,8 @@ static int __init pxa25x_udc_probe(struct platform_device *pdev)
free_irq(irq, dev); free_irq(irq, dev);
#endif #endif
err_irq1: err_irq1:
device_unregister(&dev->gadget.dev);
err_device_add:
if (gpio_is_valid(dev->mach->gpio_pullup)) if (gpio_is_valid(dev->mach->gpio_pullup))
gpio_free(dev->mach->gpio_pullup); gpio_free(dev->mach->gpio_pullup);
err_gpio_pullup: err_gpio_pullup:
...@@ -2217,10 +2218,11 @@ static int __exit pxa25x_udc_remove(struct platform_device *pdev) ...@@ -2217,10 +2218,11 @@ static int __exit pxa25x_udc_remove(struct platform_device *pdev)
{ {
struct pxa25x_udc *dev = platform_get_drvdata(pdev); struct pxa25x_udc *dev = platform_get_drvdata(pdev);
usb_del_gadget_udc(&dev->gadget);
if (dev->driver) if (dev->driver)
return -EBUSY; return -EBUSY;
usb_del_gadget_udc(&dev->gadget);
device_unregister(&dev->gadget.dev);
dev->pullup = 0; dev->pullup = 0;
pullup(dev); pullup(dev);
......
...@@ -1814,11 +1814,6 @@ static int pxa27x_udc_start(struct usb_gadget *g, ...@@ -1814,11 +1814,6 @@ static int pxa27x_udc_start(struct usb_gadget *g,
udc->gadget.dev.driver = &driver->driver; udc->gadget.dev.driver = &driver->driver;
dplus_pullup(udc, 1); dplus_pullup(udc, 1);
retval = device_add(&udc->gadget.dev);
if (retval) {
dev_err(udc->dev, "device_add error %d\n", retval);
goto fail;
}
if (!IS_ERR_OR_NULL(udc->transceiver)) { if (!IS_ERR_OR_NULL(udc->transceiver)) {
retval = otg_set_peripheral(udc->transceiver->otg, retval = otg_set_peripheral(udc->transceiver->otg,
&udc->gadget); &udc->gadget);
...@@ -1876,7 +1871,6 @@ static int pxa27x_udc_stop(struct usb_gadget *g, ...@@ -1876,7 +1871,6 @@ static int pxa27x_udc_stop(struct usb_gadget *g,
udc->driver = NULL; udc->driver = NULL;
device_del(&udc->gadget.dev);
if (!IS_ERR_OR_NULL(udc->transceiver)) if (!IS_ERR_OR_NULL(udc->transceiver))
return otg_set_peripheral(udc->transceiver->otg, NULL); return otg_set_peripheral(udc->transceiver->otg, NULL);
...@@ -2480,13 +2474,24 @@ static int __init pxa_udc_probe(struct platform_device *pdev) ...@@ -2480,13 +2474,24 @@ static int __init pxa_udc_probe(struct platform_device *pdev)
driver_name, udc->irq, retval); driver_name, udc->irq, retval);
goto err_irq; goto err_irq;
} }
retval = device_add(&udc->gadget.dev);
if (retval) {
dev_err(udc->dev, "device_add error %d\n", retval);
goto err_dev_add;
}
retval = usb_add_gadget_udc(&pdev->dev, &udc->gadget); retval = usb_add_gadget_udc(&pdev->dev, &udc->gadget);
if (retval) if (retval)
goto err_add_udc; goto err_add_udc;
pxa_init_debugfs(udc); pxa_init_debugfs(udc);
return 0; return 0;
err_add_udc: err_add_udc:
device_unregister(&udc->gadget.dev);
err_dev_add:
free_irq(udc->irq, udc); free_irq(udc->irq, udc);
err_irq: err_irq:
iounmap(udc->regs); iounmap(udc->regs);
...@@ -2507,6 +2512,7 @@ static int __exit pxa_udc_remove(struct platform_device *_dev) ...@@ -2507,6 +2512,7 @@ static int __exit pxa_udc_remove(struct platform_device *_dev)
int gpio = udc->mach->gpio_pullup; int gpio = udc->mach->gpio_pullup;
usb_del_gadget_udc(&udc->gadget); usb_del_gadget_udc(&udc->gadget);
device_del(&udc->gadget.dev);
usb_gadget_unregister_driver(udc->driver); usb_gadget_unregister_driver(udc->driver);
free_irq(udc->irq, udc); free_irq(udc->irq, udc);
pxa_cleanup_debugfs(udc); pxa_cleanup_debugfs(udc);
......
...@@ -1668,8 +1668,7 @@ static void s3c2410_udc_enable(struct s3c2410_udc *dev) ...@@ -1668,8 +1668,7 @@ static void s3c2410_udc_enable(struct s3c2410_udc *dev)
static int s3c2410_udc_start(struct usb_gadget *g, static int s3c2410_udc_start(struct usb_gadget *g,
struct usb_gadget_driver *driver) struct usb_gadget_driver *driver)
{ {
struct s3c2410_udc *udc = to_s3c2410(g) struct s3c2410_udc *udc = to_s3c2410(g);
int retval;
dprintk(DEBUG_NORMAL, "%s() '%s'\n", __func__, driver->driver.name); dprintk(DEBUG_NORMAL, "%s() '%s'\n", __func__, driver->driver.name);
...@@ -1677,22 +1676,10 @@ static int s3c2410_udc_start(struct usb_gadget *g, ...@@ -1677,22 +1676,10 @@ static int s3c2410_udc_start(struct usb_gadget *g,
udc->driver = driver; udc->driver = driver;
udc->gadget.dev.driver = &driver->driver; udc->gadget.dev.driver = &driver->driver;
/* Bind the driver */
retval = device_add(&udc->gadget.dev);
if (retval) {
dev_err(&udc->gadget.dev, "Error in device_add() : %d\n", retval);
goto register_error;
}
/* Enable udc */ /* Enable udc */
s3c2410_udc_enable(udc); s3c2410_udc_enable(udc);
return 0; return 0;
register_error:
udc->driver = NULL;
udc->gadget.dev.driver = NULL;
return retval;
} }
static int s3c2410_udc_stop(struct usb_gadget *g, static int s3c2410_udc_stop(struct usb_gadget *g,
...@@ -1700,7 +1687,6 @@ static int s3c2410_udc_stop(struct usb_gadget *g, ...@@ -1700,7 +1687,6 @@ static int s3c2410_udc_stop(struct usb_gadget *g,
{ {
struct s3c2410_udc *udc = to_s3c2410(g); struct s3c2410_udc *udc = to_s3c2410(g);
device_del(&udc->gadget.dev);
udc->driver = NULL; udc->driver = NULL;
/* Disable udc */ /* Disable udc */
...@@ -1842,6 +1828,13 @@ static int s3c2410_udc_probe(struct platform_device *pdev) ...@@ -1842,6 +1828,13 @@ static int s3c2410_udc_probe(struct platform_device *pdev)
udc->gadget.dev.parent = &pdev->dev; udc->gadget.dev.parent = &pdev->dev;
udc->gadget.dev.dma_mask = pdev->dev.dma_mask; udc->gadget.dev.dma_mask = pdev->dev.dma_mask;
/* Bind the driver */
retval = device_add(&udc->gadget.dev);
if (retval) {
dev_err(&udc->gadget.dev, "Error in device_add() : %d\n", retval);
goto err_device_add;
}
the_controller = udc; the_controller = udc;
platform_set_drvdata(pdev, udc); platform_set_drvdata(pdev, udc);
...@@ -1930,6 +1923,8 @@ static int s3c2410_udc_probe(struct platform_device *pdev) ...@@ -1930,6 +1923,8 @@ static int s3c2410_udc_probe(struct platform_device *pdev)
err_int: err_int:
free_irq(IRQ_USBD, udc); free_irq(IRQ_USBD, udc);
err_map: err_map:
device_unregister(&udc->gadget.dev);
err_device_add:
iounmap(base_addr); iounmap(base_addr);
err_mem: err_mem:
release_mem_region(rsrc_start, rsrc_len); release_mem_region(rsrc_start, rsrc_len);
...@@ -1947,10 +1942,11 @@ static int s3c2410_udc_remove(struct platform_device *pdev) ...@@ -1947,10 +1942,11 @@ static int s3c2410_udc_remove(struct platform_device *pdev)
dev_dbg(&pdev->dev, "%s()\n", __func__); dev_dbg(&pdev->dev, "%s()\n", __func__);
usb_del_gadget_udc(&udc->gadget);
if (udc->driver) if (udc->driver)
return -EBUSY; return -EBUSY;
usb_del_gadget_udc(&udc->gadget);
device_unregister(&udc->gadget.dev);
debugfs_remove(udc->regs_info); debugfs_remove(udc->regs_info);
if (udc_info && !udc_info->udc_command && if (udc_info && !udc_info->udc_command &&
......
...@@ -240,8 +240,11 @@ static int gaudio_open_snd_dev(struct gaudio *card) ...@@ -240,8 +240,11 @@ static int gaudio_open_snd_dev(struct gaudio *card)
snd = &card->playback; snd = &card->playback;
snd->filp = filp_open(fn_play, O_WRONLY, 0); snd->filp = filp_open(fn_play, O_WRONLY, 0);
if (IS_ERR(snd->filp)) { if (IS_ERR(snd->filp)) {
int ret = PTR_ERR(snd->filp);
ERROR(card, "No such PCM playback device: %s\n", fn_play); ERROR(card, "No such PCM playback device: %s\n", fn_play);
snd->filp = NULL; snd->filp = NULL;
return ret;
} }
pcm_file = snd->filp->private_data; pcm_file = snd->filp->private_data;
snd->substream = pcm_file->substream; snd->substream = pcm_file->substream;
......
...@@ -9,8 +9,6 @@ config USB_MUSB_HDRC ...@@ -9,8 +9,6 @@ config USB_MUSB_HDRC
depends on USB && USB_GADGET depends on USB && USB_GADGET
select NOP_USB_XCEIV if (ARCH_DAVINCI || MACH_OMAP3EVM || BLACKFIN) select NOP_USB_XCEIV if (ARCH_DAVINCI || MACH_OMAP3EVM || BLACKFIN)
select NOP_USB_XCEIV if (SOC_TI81XX || SOC_AM33XX) select NOP_USB_XCEIV if (SOC_TI81XX || SOC_AM33XX)
select TWL4030_USB if MACH_OMAP_3430SDP
select TWL6030_USB if MACH_OMAP_4430SDP || MACH_OMAP4_PANDA
select OMAP_CONTROL_USB if MACH_OMAP_4430SDP || MACH_OMAP4_PANDA select OMAP_CONTROL_USB if MACH_OMAP_4430SDP || MACH_OMAP4_PANDA
select USB_OTG_UTILS select USB_OTG_UTILS
help help
...@@ -51,6 +49,8 @@ config USB_MUSB_TUSB6010 ...@@ -51,6 +49,8 @@ config USB_MUSB_TUSB6010
config USB_MUSB_OMAP2PLUS config USB_MUSB_OMAP2PLUS
tristate "OMAP2430 and onwards" tristate "OMAP2430 and onwards"
depends on ARCH_OMAP2PLUS depends on ARCH_OMAP2PLUS
select TWL4030_USB if MACH_OMAP_3430SDP
select TWL6030_USB if MACH_OMAP_4430SDP || MACH_OMAP4_PANDA
config USB_MUSB_AM35X config USB_MUSB_AM35X
tristate "AM35x" tristate "AM35x"
......
...@@ -130,7 +130,7 @@ struct usb_phy *usb_get_phy(enum usb_phy_type type) ...@@ -130,7 +130,7 @@ struct usb_phy *usb_get_phy(enum usb_phy_type type)
spin_lock_irqsave(&phy_lock, flags); spin_lock_irqsave(&phy_lock, flags);
phy = __usb_find_phy(&phy_list, type); phy = __usb_find_phy(&phy_list, type);
if (IS_ERR(phy)) { if (IS_ERR(phy) || !try_module_get(phy->dev->driver->owner)) {
pr_err("unable to find transceiver of type %s\n", pr_err("unable to find transceiver of type %s\n",
usb_phy_type_string(type)); usb_phy_type_string(type));
goto err0; goto err0;
...@@ -228,7 +228,7 @@ struct usb_phy *usb_get_phy_dev(struct device *dev, u8 index) ...@@ -228,7 +228,7 @@ struct usb_phy *usb_get_phy_dev(struct device *dev, u8 index)
spin_lock_irqsave(&phy_lock, flags); spin_lock_irqsave(&phy_lock, flags);
phy = __usb_find_phy_dev(dev, &phy_bind_list, index); phy = __usb_find_phy_dev(dev, &phy_bind_list, index);
if (IS_ERR(phy)) { if (IS_ERR(phy) || !try_module_get(phy->dev->driver->owner)) {
pr_err("unable to find transceiver\n"); pr_err("unable to find transceiver\n");
goto err0; goto err0;
} }
...@@ -301,8 +301,12 @@ EXPORT_SYMBOL(devm_usb_put_phy); ...@@ -301,8 +301,12 @@ EXPORT_SYMBOL(devm_usb_put_phy);
*/ */
void usb_put_phy(struct usb_phy *x) void usb_put_phy(struct usb_phy *x)
{ {
if (x) if (x) {
struct module *owner = x->dev->driver->owner;
put_device(x->dev); put_device(x->dev);
module_put(owner);
}
} }
EXPORT_SYMBOL(usb_put_phy); EXPORT_SYMBOL(usb_put_phy);
......
...@@ -219,32 +219,26 @@ static int omap_control_usb_probe(struct platform_device *pdev) ...@@ -219,32 +219,26 @@ static int omap_control_usb_probe(struct platform_device *pdev)
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
"control_dev_conf"); "control_dev_conf");
control_usb->dev_conf = devm_request_and_ioremap(&pdev->dev, res); control_usb->dev_conf = devm_ioremap_resource(&pdev->dev, res);
if (!control_usb->dev_conf) { if (IS_ERR(control_usb->dev_conf))
dev_err(&pdev->dev, "Failed to obtain io memory\n"); return PTR_ERR(control_usb->dev_conf);
return -EADDRNOTAVAIL;
}
if (control_usb->type == OMAP_CTRL_DEV_TYPE1) { if (control_usb->type == OMAP_CTRL_DEV_TYPE1) {
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
"otghs_control"); "otghs_control");
control_usb->otghs_control = devm_request_and_ioremap( control_usb->otghs_control = devm_ioremap_resource(
&pdev->dev, res); &pdev->dev, res);
if (!control_usb->otghs_control) { if (IS_ERR(control_usb->otghs_control))
dev_err(&pdev->dev, "Failed to obtain io memory\n"); return PTR_ERR(control_usb->otghs_control);
return -EADDRNOTAVAIL;
}
} }
if (control_usb->type == OMAP_CTRL_DEV_TYPE2) { if (control_usb->type == OMAP_CTRL_DEV_TYPE2) {
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
"phy_power_usb"); "phy_power_usb");
control_usb->phy_power = devm_request_and_ioremap( control_usb->phy_power = devm_ioremap_resource(
&pdev->dev, res); &pdev->dev, res);
if (!control_usb->phy_power) { if (IS_ERR(control_usb->phy_power))
dev_dbg(&pdev->dev, "Failed to obtain io memory\n"); return PTR_ERR(control_usb->phy_power);
return -EADDRNOTAVAIL;
}
control_usb->sys_clk = devm_clk_get(control_usb->dev, control_usb->sys_clk = devm_clk_get(control_usb->dev,
"sys_clkin"); "sys_clkin");
......
...@@ -212,11 +212,9 @@ static int omap_usb3_probe(struct platform_device *pdev) ...@@ -212,11 +212,9 @@ static int omap_usb3_probe(struct platform_device *pdev)
} }
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pll_ctrl"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pll_ctrl");
phy->pll_ctrl_base = devm_request_and_ioremap(&pdev->dev, res); phy->pll_ctrl_base = devm_ioremap_resource(&pdev->dev, res);
if (!phy->pll_ctrl_base) { if (IS_ERR(phy->pll_ctrl_base))
dev_err(&pdev->dev, "ioremap of pll_ctrl failed\n"); return PTR_ERR(phy->pll_ctrl_base);
return -ENOMEM;
}
phy->dev = &pdev->dev; phy->dev = &pdev->dev;
......
...@@ -787,11 +787,9 @@ static int samsung_usbphy_probe(struct platform_device *pdev) ...@@ -787,11 +787,9 @@ static int samsung_usbphy_probe(struct platform_device *pdev)
return -ENODEV; return -ENODEV;
} }
phy_base = devm_request_and_ioremap(dev, phy_mem); phy_base = devm_ioremap_resource(dev, phy_mem);
if (!phy_base) { if (IS_ERR(phy_base))
dev_err(dev, "%s: register mapping failed\n", __func__); return PTR_ERR(phy_base);
return -ENXIO;
}
sphy = devm_kzalloc(dev, sizeof(*sphy), GFP_KERNEL); sphy = devm_kzalloc(dev, sizeof(*sphy), GFP_KERNEL);
if (!sphy) if (!sphy)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment