hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

memstick: rtsx_usb_ms: Manage runtime PM when accessing the device 

Accesses to the rtsx usb device, which is the parent of the rtsx memstick
device, must not be done unless it's runtime resumed. This is currently not
the case and it could trigger various errors.

Fix this by properly deal with runtime PM in this regards. This means
making sure the device is runtime resumed, when serving requests via the
->request() callback or changing settings via the ->set_param() callbacks.

Cc: <stable@vger.kernel.org>
Cc: Ritesh Raj Sarraf <rrs@researchut.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Ulf Hansson 2016-09-28 11:33:28 -07:00
parent 796aa46adf
commit 9158cb29e7
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/memstick/host/rtsx_usb_ms.c
View File

@ -524,6 +524,7 @@ static void rtsx_usb_ms_handle_req(struct work_struct *work)
int rc; int rc;
if (!host->req) { if (!host->req) {
pm_runtime_get_sync(ms_dev(host));
do { do {
rc = memstick_next_req(msh, &host->req); rc = memstick_next_req(msh, &host->req);
dev_dbg(ms_dev(host), "next req %d\n", rc); dev_dbg(ms_dev(host), "next req %d\n", rc);
@ -544,6 +545,7 @@ static void rtsx_usb_ms_handle_req(struct work_struct *work)
host->req->error); host->req->error);
} }
} while (!rc); } while (!rc);
pm_runtime_put(ms_dev(host));
} }
} }
@ -570,6 +572,7 @@ static int rtsx_usb_ms_set_param(struct memstick_host *msh,
dev_dbg(ms_dev(host), "%s: param = %d, value = %d\n", dev_dbg(ms_dev(host), "%s: param = %d, value = %d\n",
__func__, param, value); __func__, param, value);
pm_runtime_get_sync(ms_dev(host));
mutex_lock(&ucr->dev_mutex); mutex_lock(&ucr->dev_mutex);
err = rtsx_usb_card_exclusive_check(ucr, RTSX_USB_MS_CARD); err = rtsx_usb_card_exclusive_check(ucr, RTSX_USB_MS_CARD);
@ -635,6 +638,7 @@ static int rtsx_usb_ms_set_param(struct memstick_host *msh,
} }
out: out:
mutex_unlock(&ucr->dev_mutex); mutex_unlock(&ucr->dev_mutex);
pm_runtime_put(ms_dev(host));
/* power-on delay */ /* power-on delay */
if (param == MEMSTICK_POWER && value == MEMSTICK_POWER_ON) if (param == MEMSTICK_POWER && value == MEMSTICK_POWER_ON)