diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-05 15:10:09 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-05 15:10:09 -0700 |
| commit | 94ff447cf275170042a7a05b972b6da8b94754ca (patch) | |
| tree | f3d20c78d5ec68f29874be4cdce3c5a8d1c5de53 /drivers/usb/gadget/fsl_udc_core.c | |
| parent | 979eef33267ec230b820f4f76b2103e8b567fa57 (diff) | |
| parent | 65c84ea18b1b4b8c03fb67c3bea023ed1446bd2e (diff) | |
Merge tag 'gadget-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
usb: gadget: patches for v3.6 merge window
This is quite a big pull request and contains patches
all over the place.
omap_udc is now a bit cleaner after removing omap2 support,
fixing some checkpatch.pl warnings and errors, switching over
to generic map/unmap routines and preventing a NULL pointer
de-reference.
s3c-hsotg has been switched over to devm_* API, got some
locking fixes and improvements and it also got an implementation
for the pullup() method.
the mass storage gadgets changed default value of the removable
parameter, dropped some unused options and made "file" and "ro"
module_parameters read-only in some cases.
ffs function got support for HID descriptor.
Some UDCs have been converted to clk_prepare_enable() and
clk_disable_unprepare().
Marvell now got support for its USB3 controller in mainline
after introducing its mv_u3d_core.c driver.
Diffstat (limited to 'drivers/usb/gadget/fsl_udc_core.c')
| -rw-r--r-- | drivers/usb/gadget/fsl_udc_core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c index bc6f9bb9994..a65ca0f5d8c 100644 --- a/drivers/usb/gadget/fsl_udc_core.c +++ b/drivers/usb/gadget/fsl_udc_core.c @@ -2560,6 +2560,7 @@ static int __init fsl_udc_probe(struct platform_device *pdev) dev_set_name(&udc_controller->gadget.dev, "gadget"); udc_controller->gadget.dev.release = fsl_udc_release; udc_controller->gadget.dev.parent = &pdev->dev; + udc_controller->gadget.dev.of_node = pdev->dev.of_node; ret = device_register(&udc_controller->gadget.dev); if (ret < 0) goto err_free_irq; |