Following the name change of the NOP transceiver driver in commit
4525bee (usb: phy: rename usb_nop_xceiv to usb_phy_generic), make sure
to register the transceiver driver before calling usb_get_phy() to
avoid issues related to accessing its data structure while it was not
registered.

Signed-off-by: Apelete Seketeli <apel...@seketeli.net>
---
 drivers/usb/musb/jz4740.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/usb/musb/jz4740.c b/drivers/usb/musb/jz4740.c
index 5f30537..d118729 100644
--- a/drivers/usb/musb/jz4740.c
+++ b/drivers/usb/musb/jz4740.c
@@ -19,6 +19,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/usb/usb_phy_generic.h>
 
 #include "musb_core.h"
 
@@ -80,6 +81,7 @@ static struct musb_hdrc_platform_data 
jz4740_musb_platform_data = {
 
 static int jz4740_musb_init(struct musb *musb)
 {
+       usb_phy_generic_register();
        musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);
        if (!musb->xceiv) {
                pr_err("HS UDC: no transceiver configured\n");
@@ -182,6 +184,7 @@ static int jz4740_remove(struct platform_device *pdev)
        struct jz4740_glue      *glue = platform_get_drvdata(pdev);
 
        platform_device_unregister(glue->musb);
+       usb_phy_generic_unregister(pdev);
        clk_disable_unprepare(glue->clk);
 
        return 0;
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to