summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorApelete Seketeli <apelete@seketeli.net>2014-07-05 21:30:15 +0200
committerRalf Baechle <ralf@linux-mips.org>2014-08-01 18:37:42 +0200
commitc7fb97d65aece5b03a9209ea5a9670e952c62f34 (patch)
treeaecec3bfeb7299d468cb522ada5fa32e2866707b
parent7d907fa1c6ccb64c7f64cc7d3dcc7f6fe30a67b4 (diff)
downloadlinux-c7fb97d65aece5b03a9209ea5a9670e952c62f34.tar.bz2
MIPS: Jz4740: Rename usb_nop_xceiv to usb_phy_generic
Rename usb_nop_xceiv to usb_phy_generic in platform data to match the name change of the nop transceiver driver in commit 4525bee (usb: phy: rename usb_nop_xceiv to usb_phy_generic). The name change induced a kernel panic due to an unhandled kernel unaligned access while trying to dereference musb->xceiv->io_ops in musb_init_controller(). Signed-off-by: Apelete Seketeli <apelete@seketeli.net> Acked-by: Lars-Peter Clausen <lars@metafoo.de> Cc: John Crispin <blogic@openwrt.org> Cc: Paul Gortmaker <paul.gortmaker@windriver.com> Cc: Vinod Koul <vinod.koul@intel.com> Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/7263/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/jz4740/platform.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/jz4740/platform.c b/arch/mips/jz4740/platform.c
index a447101cf9f1..0b12f273cb2e 100644
--- a/arch/mips/jz4740/platform.c
+++ b/arch/mips/jz4740/platform.c
@@ -59,7 +59,7 @@ struct platform_device jz4740_usb_ohci_device = {
/* USB Device Controller */
struct platform_device jz4740_udc_xceiv_device = {
- .name = "usb_phy_gen_xceiv",
+ .name = "usb_phy_generic",
.id = 0,
};