diff options
Diffstat (limited to 'drivers/usb/musb/tusb6010.c')
-rw-r--r-- | drivers/usb/musb/tusb6010.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c index de1355946a83..1a1bd9cf40c5 100644 --- a/drivers/usb/musb/tusb6010.c +++ b/drivers/usb/musb/tusb6010.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
18 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
19 | #include <linux/errno.h> | 19 | #include <linux/errno.h> |
20 | #include <linux/err.h> | ||
20 | #include <linux/init.h> | 21 | #include <linux/init.h> |
21 | #include <linux/prefetch.h> | 22 | #include <linux/prefetch.h> |
22 | #include <linux/usb.h> | 23 | #include <linux/usb.h> |
@@ -1078,8 +1079,8 @@ static int tusb_musb_init(struct musb *musb) | |||
1078 | int ret; | 1079 | int ret; |
1079 | 1080 | ||
1080 | usb_nop_xceiv_register(); | 1081 | usb_nop_xceiv_register(); |
1081 | musb->xceiv = usb_get_transceiver(); | 1082 | musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2); |
1082 | if (!musb->xceiv) | 1083 | if (IS_ERR_OR_NULL(musb->xceiv)) |
1083 | return -ENODEV; | 1084 | return -ENODEV; |
1084 | 1085 | ||
1085 | pdev = to_platform_device(musb->controller); | 1086 | pdev = to_platform_device(musb->controller); |
@@ -1130,7 +1131,7 @@ done: | |||
1130 | if (sync) | 1131 | if (sync) |
1131 | iounmap(sync); | 1132 | iounmap(sync); |
1132 | 1133 | ||
1133 | usb_put_transceiver(musb->xceiv); | 1134 | usb_put_phy(musb->xceiv); |
1134 | usb_nop_xceiv_unregister(); | 1135 | usb_nop_xceiv_unregister(); |
1135 | } | 1136 | } |
1136 | return ret; | 1137 | return ret; |
@@ -1146,7 +1147,7 @@ static int tusb_musb_exit(struct musb *musb) | |||
1146 | 1147 | ||
1147 | iounmap(musb->sync_va); | 1148 | iounmap(musb->sync_va); |
1148 | 1149 | ||
1149 | usb_put_transceiver(musb->xceiv); | 1150 | usb_put_phy(musb->xceiv); |
1150 | usb_nop_xceiv_unregister(); | 1151 | usb_nop_xceiv_unregister(); |
1151 | return 0; | 1152 | return 0; |
1152 | } | 1153 | } |