lkml.org 
[lkml]   [2016]   [Oct]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/6] memstick: rtsx_usb_ms: Manage runtime PM when accessing the device
    Date
    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>
    ---
    drivers/memstick/host/rtsx_usb_ms.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/drivers/memstick/host/rtsx_usb_ms.c b/drivers/memstick/host/rtsx_usb_ms.c
    index 1b99489..2e3cf01 100644
    --- a/drivers/memstick/host/rtsx_usb_ms.c
    +++ b/drivers/memstick/host/rtsx_usb_ms.c
    @@ -524,6 +524,7 @@ static void rtsx_usb_ms_handle_req(struct work_struct *work)
    int rc;

    if (!host->req) {
    + pm_runtime_get_sync(ms_dev(host));
    do {
    rc = memstick_next_req(msh, &host->req);
    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);
    }
    } 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",
    __func__, param, value);

    + pm_runtime_get_sync(ms_dev(host));
    mutex_lock(&ucr->dev_mutex);

    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:
    mutex_unlock(&ucr->dev_mutex);
    + pm_runtime_put(ms_dev(host));

    /* power-on delay */
    if (param == MEMSTICK_POWER && value == MEMSTICK_POWER_ON)
    --
    1.9.1
    \
     
     \ /
      Last update: 2016-10-13 13:40    [W:4.421 / U:0.276 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site