From: Arve Hjønnevåg Date: Tue, 27 Nov 2012 00:09:13 +0000 (-0800) Subject: usb: otg: otg-wakelock: Fix build for 3.7 X-Git-Tag: firefly_0821_release~4090^2~543 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5f08b153be002b4a314c410083de23e049333d02;p=firefly-linux-kernel-4.4.55.git usb: otg: otg-wakelock: Fix build for 3.7 Signed-off-by: Arve Hjønnevåg --- diff --git a/drivers/usb/phy/otg-wakelock.c b/drivers/usb/phy/otg-wakelock.c index e17e27299062..479376bfa484 100644 --- a/drivers/usb/phy/otg-wakelock.c +++ b/drivers/usb/phy/otg-wakelock.c @@ -16,6 +16,7 @@ #include #include +#include #include #include #include @@ -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));