git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'hotfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[pandora-kernel.git]
/
drivers
/
usb
/
gadget
/
m66592-udc.c
diff --git
a/drivers/usb/gadget/m66592-udc.c
b/drivers/usb/gadget/m66592-udc.c
index
ee6b35f
..
77b44fb
100644
(file)
--- a/
drivers/usb/gadget/m66592-udc.c
+++ b/
drivers/usb/gadget/m66592-udc.c
@@
-1593,7
+1593,7
@@
static int __init m66592_probe(struct platform_device *pdev)
m66592->gadget.ops = &m66592_gadget_ops;
device_initialize(&m66592->gadget.dev);
m66592->gadget.ops = &m66592_gadget_ops;
device_initialize(&m66592->gadget.dev);
-
strcpy(m66592->gadget.dev.bus_id
, "gadget");
+
dev_set_name(&m66592->gadget.dev
, "gadget");
m66592->gadget.is_dualspeed = 1;
m66592->gadget.dev.parent = &pdev->dev;
m66592->gadget.dev.dma_mask = pdev->dev.dma_mask;
m66592->gadget.is_dualspeed = 1;
m66592->gadget.dev.parent = &pdev->dev;
m66592->gadget.dev.dma_mask = pdev->dev.dma_mask;