diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-01-14 22:25:14 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-01-14 22:25:14 +0800 |
| commit | f90ae1b62bedd8b57966a7be68855f2d43170db6 (patch) | |
| tree | dc332d18219749a17b163d740b8713be5e8d940b /drivers/media/usb/gspca/m5602/m5602_s5k83a.c | |
| parent | 346a8beb760237fb0fed811045ec92c799f48d54 (diff) | |
| parent | 60917545df1ffc7f918550512dc4a14758f74784 (diff) | |
Merge remote-tracking branch 'lts/linux-3.18.y' into linux-linaro-lsk-v3.18lsk-v3.18-16.01
Diffstat (limited to 'drivers/media/usb/gspca/m5602/m5602_s5k83a.c')
| -rw-r--r-- | drivers/media/usb/gspca/m5602/m5602_s5k83a.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/gspca/m5602/m5602_s5k83a.c b/drivers/media/usb/gspca/m5602/m5602_s5k83a.c index 7cbc3a00bda8..bf6b215438e3 100644 --- a/drivers/media/usb/gspca/m5602/m5602_s5k83a.c +++ b/drivers/media/usb/gspca/m5602/m5602_s5k83a.c @@ -177,7 +177,7 @@ static int rotation_thread_function(void *data) __s32 vflip, hflip; set_current_state(TASK_INTERRUPTIBLE); - while (!schedule_timeout(100)) { + while (!schedule_timeout(msecs_to_jiffies(100))) { if (mutex_lock_interruptible(&sd->gspca_dev.usb_lock)) break; |