lkml.org 
[lkml]   [2016]   [Aug]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 1/1] mfd: rtsx_usb: avoid setting ucr->current_sg.status
On Thu, 11 Aug 2016, Lu Baolu wrote:

> Member "status" of struct usb_sg_request is managed by usb core. A
> spin lock is used to serialize the change of it. The driver could
> check the value of req->status, but should avoid changing it without
> the hold of the spinlock. Otherwise, it could cause race or error
> in usb core.
>
> This patch could be backported to stable kernels with version later
> than v3.14.
>
> Cc: stable@vger.kernel.org # 3.14+
> Cc: Alan Stern <stern@rowland.harvard.edu>
> Cc: Roger Tseng <rogerable@realtek.com>
> Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
> ---
> drivers/mfd/rtsx_usb.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)

Applied, thanks.

> diff --git a/drivers/mfd/rtsx_usb.c b/drivers/mfd/rtsx_usb.c
> index dbd907d..691dab7 100644
> --- a/drivers/mfd/rtsx_usb.c
> +++ b/drivers/mfd/rtsx_usb.c
> @@ -46,9 +46,6 @@ static void rtsx_usb_sg_timed_out(unsigned long data)
>
> dev_dbg(&ucr->pusb_intf->dev, "%s: sg transfer timed out", __func__);
> usb_sg_cancel(&ucr->current_sg);
> -
> - /* we know the cancellation is caused by time-out */
> - ucr->current_sg.status = -ETIMEDOUT;
> }
>
> static int rtsx_usb_bulk_transfer_sglist(struct rtsx_ucr *ucr,
> @@ -67,12 +64,15 @@ static int rtsx_usb_bulk_transfer_sglist(struct rtsx_ucr *ucr,
> ucr->sg_timer.expires = jiffies + msecs_to_jiffies(timeout);
> add_timer(&ucr->sg_timer);
> usb_sg_wait(&ucr->current_sg);
> - del_timer_sync(&ucr->sg_timer);
> + if (!del_timer_sync(&ucr->sg_timer))
> + ret = -ETIMEDOUT;
> + else
> + ret = ucr->current_sg.status;
>
> if (act_len)
> *act_len = ucr->current_sg.bytes;
>
> - return ucr->current_sg.status;
> + return ret;
> }
>
> int rtsx_usb_transfer_data(struct rtsx_ucr *ucr, unsigned int pipe,

--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

\
 
 \ /
  Last update: 2016-09-17 09:58    [W:0.065 / U:0.496 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site