usb: otg: otg-wakelock: Fix build for 3.7
authorArve Hjønnevåg <arve@android.com>
Tue, 27 Nov 2012 00:09:13 +0000 (16:09 -0800)
committerArve Hjønnevåg <arve@android.com>
Mon, 1 Jul 2013 22:51:48 +0000 (15:51 -0700)
Signed-off-by: Arve Hjønnevåg <arve@android.com>
drivers/usb/phy/otg-wakelock.c

index e17e27299062c74a7dca9ce96ef612c585d35c5c..479376bfa484bd73edc76a7cae115c37d4e729ae 100644 (file)
@@ -16,6 +16,7 @@
 
 #include <linux/kernel.h>
 #include <linux/device.h>
+#include <linux/err.h>
 #include <linux/module.h>
 #include <linux/notifier.h>
 #include <linux/wakelock.h>
@@ -138,13 +139,15 @@ MODULE_PARM_DESC(enabled, "enable wakelock when VBUS present");
 static int __init otg_wakelock_init(void)
 {
        int ret;
+       struct usb_phy *phy;
 
-       otgwl_xceiv = usb_get_transceiver();
+       phy = usb_get_phy(USB_PHY_TYPE_USB2);
 
-       if (!otgwl_xceiv) {
+       if (IS_ERR(phy)) {
                pr_err("%s: No USB transceiver found\n", __func__);
-               return -ENODEV;
+               return PTR_ERR(phy);
        }
+       otgwl_xceiv = phy;
 
        snprintf(vbus_lock.name, sizeof(vbus_lock.name), "vbus-%s",
                 dev_name(otgwl_xceiv->dev));