diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-17 18:22:41 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-17 18:22:41 +1000 |
| commit | e42321ef0002b517c9fefdf43cc39e24462b16cf (patch) | |
| tree | 70e013f5f7f45da559afa8167039e37e5eab96ff /drivers/scsi/scsi_sysfs.c | |
| parent | 1e2d23cc747df325a0ff199dd4ac250e1d8cc7a0 (diff) | |
| parent | aa661602d17c90be3fc9c2f22359c17c98db4c11 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/scsi/scsi_sysfs.c')
| -rw-r--r-- | drivers/scsi/scsi_sysfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index 5f36788705ba..4a6f524a63b9 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c @@ -885,9 +885,9 @@ sdev_store_queue_ramp_up_period(struct device *dev, const char *buf, size_t count) { struct scsi_device *sdev = to_scsi_device(dev); - unsigned long period; + unsigned int period; - if (strict_strtoul(buf, 10, &period)) + if (kstrtouint(buf, 10, &period)) return -EINVAL; sdev->queue_ramp_up_period = msecs_to_jiffies(period); |