]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
memstick: rtsx_usb_ms: Runtime resume the device when polling for cards
authorAlan Stern <stern@rowland.harvard.edu>
Mon, 26 Sep 2016 22:45:41 +0000 (15:45 -0700)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 17 Oct 2016 13:43:04 +0000 (15:43 +0200)
Accesses to the rtsx usb device, which is the parent of the rtsx memstick
device, must not be done unless it's runtime resumed.

Therefore when the rtsx_usb_ms driver polls for inserted memstick cards,
let's add pm_runtime_get|put*() to make sure accesses is done when the
rtsx usb device is runtime resumed.

Reported-by: Ritesh Raj Sarraf <rrs@researchut.com>
Tested-by: Ritesh Raj Sarraf <rrs@researchut.com>
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Cc: <stable@vger.kernel.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/memstick/host/rtsx_usb_ms.c

index d34bc35303851634d143f924a790a47a7f006e8c..1b994897f0ff7a7e14cdc331350ea346acfddba0 100644 (file)
@@ -681,6 +681,7 @@ static int rtsx_usb_detect_ms_card(void *__host)
        int err;
 
        for (;;) {
+               pm_runtime_get_sync(ms_dev(host));
                mutex_lock(&ucr->dev_mutex);
 
                /* Check pending MS card changes */
@@ -703,6 +704,7 @@ static int rtsx_usb_detect_ms_card(void *__host)
                }
 
 poll_again:
+               pm_runtime_put(ms_dev(host));
                if (host->eject)
                        break;