diff options
| author | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2013-09-27 11:56:14 -0300 |
|---|---|---|
| committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2013-09-27 11:56:14 -0300 |
| commit | 1025c04cecd19882e28f16c4004034b475c372c5 (patch) | |
| tree | 2b7402887e86d54bff5a123228c9059eae5e32bd /drivers/ide/ide-park.c | |
| parent | 4375f1037d52602413142e290608d0d84671ad36 (diff) | |
| parent | 5bcecf325378218a8e248bb6bcae96ec7362f8ef (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Conflicts:
net/bluetooth/hci_core.c
Diffstat (limited to 'drivers/ide/ide-park.c')
| -rw-r--r-- | drivers/ide/ide-park.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ide/ide-park.c b/drivers/ide/ide-park.c index 6ab9ab2a508..f41558a0bcd 100644 --- a/drivers/ide/ide-park.c +++ b/drivers/ide/ide-park.c @@ -116,8 +116,10 @@ ssize_t ide_park_store(struct device *dev, struct device_attribute *attr, long int input; int rc; - rc = strict_strtol(buf, 10, &input); - if (rc || input < -2) + rc = kstrtol(buf, 10, &input); + if (rc) + return rc; + if (input < -2) return -EINVAL; if (input > MAX_PARK_TIMEOUT) { input = MAX_PARK_TIMEOUT; |