UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

uas: new function to cancel data urbs 

Add uas_unlink_data_urbs function to cancel in-flight data urbs.
Moves existing code into a separate function.

[ v2: also drop the locking, just call usb_unlink_urb no matter what,
      which is safe because the usb core guarantees the completion
      callback is called only once ]

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Gerd Hoffmann 2012-11-30 11:54:40 +01:00 committed by Greg Kroah-Hartman
parent 6a099c6365
commit aa8f612370
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/usb/storage/uas.c
View File

@ -87,6 +87,15 @@ static DECLARE_WORK(uas_work, uas_do_work);
static DEFINE_SPINLOCK(uas_work_lock); static DEFINE_SPINLOCK(uas_work_lock);
static LIST_HEAD(uas_work_list); static LIST_HEAD(uas_work_list);
static void uas_unlink_data_urbs(struct uas_dev_info *devinfo,
struct uas_cmd_info *cmdinfo)
{
if (cmdinfo->data_in_urb)
usb_unlink_urb(cmdinfo->data_in_urb);
if (cmdinfo->data_out_urb)
usb_unlink_urb(cmdinfo->data_out_urb);
}
static void uas_do_work(struct work_struct *work) static void uas_do_work(struct work_struct *work)
{ {
struct uas_cmd_info *cmdinfo; struct uas_cmd_info *cmdinfo;
@ -274,16 +283,9 @@ static void uas_stat_cmplt(struct urb *urb)
uas_sense(urb, cmnd); uas_sense(urb, cmnd);
if (cmnd->result != 0) { if (cmnd->result != 0) {
/* cancel data transfers on error */ /* cancel data transfers on error */
if (cmdinfo->state & DATA_IN_URB_INFLIGHT) { spin_unlock_irqrestore(&devinfo->lock, flags);
spin_unlock_irqrestore(&devinfo->lock, flags); uas_unlink_data_urbs(devinfo, cmdinfo);
usb_unlink_urb(cmdinfo->data_in_urb); spin_lock_irqsave(&devinfo->lock, flags);
spin_lock_irqsave(&devinfo->lock, flags);
}
if (cmdinfo->state & DATA_OUT_URB_INFLIGHT) {
spin_unlock_irqrestore(&devinfo->lock, flags);
usb_unlink_urb(cmdinfo->data_out_urb);
spin_lock_irqsave(&devinfo->lock, flags);
}
} }
cmdinfo->state &= ~COMMAND_INFLIGHT; cmdinfo->state &= ~COMMAND_INFLIGHT;
uas_try_complete(cmnd, __func__); uas_try_complete(cmnd, __func__);