diff options
Diffstat (limited to 'drivers/scsi/sg.c')
| -rw-r--r-- | drivers/scsi/sg.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index ae7d9bdf409c..bb5ec2d6abdf 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c @@ -884,8 +884,9 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg) return result; if (val < 0) return -EIO; - if (val >= MULDIV (INT_MAX, USER_HZ, HZ)) - val = MULDIV (INT_MAX, USER_HZ, HZ); + if (val >= MULDIV((s64)INT_MAX, USER_HZ, HZ)) + val = min_t(s64, MULDIV((s64)INT_MAX, USER_HZ, HZ), + INT_MAX); sfp->timeout_user = val; sfp->timeout = MULDIV (val, HZ, USER_HZ); |