diff options
| author | Arve Hjønnevåg <arve@android.com> | 2012-11-26 16:09:13 -0800 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2013-04-29 14:52:24 -0700 |
| commit | 61131fc03ed2117587d4d9e21bda9929b2a620d9 (patch) | |
| tree | be13adb771a7d57b4691b8614c2770349da2a52b | |
| parent | 2e531b9ea0f175371f58747c639547365e5815d8 (diff) | |
usb: otg: otg-wakelock: Fix build for 3.7
Signed-off-by: Arve Hjønnevåg <arve@android.com>
| -rw-r--r-- | drivers/usb/otg/otg-wakelock.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/usb/otg/otg-wakelock.c b/drivers/usb/otg/otg-wakelock.c index e17e2729906..479376bfa48 100644 --- a/drivers/usb/otg/otg-wakelock.c +++ b/drivers/usb/otg/otg-wakelock.c @@ -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)); |