From ba2b6bf932dc2ff3dbed810b6aeba852faf613a9 Mon Sep 17 00:00:00 2001 From: Wu Liang feng Date: Mon, 15 Aug 2016 15:47:21 +0800 Subject: [PATCH] phy: rockchip-inno-usb2: don't cancel otg_sm_work when phy exit The otg_sm_work is a OTG state machine delay work. It will hold a wake lock if SDP cable or CDP cable is attached, and release the wake lock if cable dettached. If usb controller(e.g. DWC3) call phy exit When USB cable is dettached and cancel otg_sm_work, it will cause the usb phy keeping hold of wake lock. Change-Id: Ie6a89e481b8d4999a996083709bacc5be901805a Signed-off-by: Wu Liang feng Signed-off-by: Frank Wang --- drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c index 7e6804321c8a..6ef2584916cc 100644 --- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c +++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c @@ -525,7 +525,6 @@ static int rockchip_usb2phy_exit(struct phy *phy) rport->mode != USB_DR_MODE_HOST && rport->mode != USB_DR_MODE_UNKNOWN && !rport->vbus_always_on) { - cancel_delayed_work_sync(&rport->otg_sm_work); cancel_delayed_work_sync(&rport->chg_work); } else if (rport->port_id == USB2PHY_PORT_HOST) cancel_delayed_work_sync(&rport->sm_work);