diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-12-10 07:28:43 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-12-10 07:28:43 -0800 |
| commit | a69ce65274ff1589bb64ea782a4178d7210da0bb (patch) | |
| tree | d039adba20838b165626987a5f63ff89c3e16338 /drivers/usb/class/usblp.c | |
| parent | caf91bc186175f0005ed77295f1acd52c6aeca47 (diff) | |
| parent | d235b7b42ab59e2e616082a0735b3bcc76685c7b (diff) | |
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-androidlsk-v3.10-16.01-androidlsk-v3.10-15.12-android
Diffstat (limited to 'drivers/usb/class/usblp.c')
| -rw-r--r-- | drivers/usb/class/usblp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c index d4c47d5d7625..7ac5fac8600b 100644 --- a/drivers/usb/class/usblp.c +++ b/drivers/usb/class/usblp.c @@ -870,11 +870,11 @@ static int usblp_wwait(struct usblp *usblp, int nonblock) add_wait_queue(&usblp->wwait, &waita); for (;;) { - set_current_state(TASK_INTERRUPTIBLE); if (mutex_lock_interruptible(&usblp->mut)) { rc = -EINTR; break; } + set_current_state(TASK_INTERRUPTIBLE); rc = usblp_wtest(usblp, nonblock); mutex_unlock(&usblp->mut); if (rc <= 0) |