diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-23 17:20:58 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-23 17:20:58 -0400 |
| commit | 9528454f9c02fb9c359c4c42c69eed4d47407e39 (patch) | |
| tree | 40e8c7f829b528073d2b216c3b8e6be205c76245 /drivers/usb/input/hiddev.c | |
| parent | 777e1d4a0f3387933f668e7adc81384827975189 (diff) | |
| parent | 1faadface9c5d000bb16e42c89f24859337cf2db (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/usb/input/hiddev.c')
| -rw-r--r-- | drivers/usb/input/hiddev.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/input/hiddev.c b/drivers/usb/input/hiddev.c index 6dd666696178..c4670e1d4654 100644 --- a/drivers/usb/input/hiddev.c +++ b/drivers/usb/input/hiddev.c | |||
| @@ -317,6 +317,7 @@ static ssize_t hiddev_read(struct file * file, char __user * buffer, size_t coun | |||
| 317 | } | 317 | } |
| 318 | 318 | ||
| 319 | schedule(); | 319 | schedule(); |
| 320 | set_current_state(TASK_INTERRUPTIBLE); | ||
| 320 | } | 321 | } |
| 321 | 322 | ||
| 322 | set_current_state(TASK_RUNNING); | 323 | set_current_state(TASK_RUNNING); |