diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 13:36:48 +1000 |
---|---|---|
committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 13:36:48 +1000 |
commit | 6e55663080e33d1856d949d60e45b135f2613087 (patch) | |
tree | 7318387028176038ca96344831febb30a582d661 /miscutils/hdparm.c | |
parent | c6933c626b97c3f6bc446586ee2e6c7d9930c938 (diff) | |
parent | dcaed97e0f44d0cd285fb590ec6ec80d0d73e738 (diff) | |
download | busybox-w32-6e55663080e33d1856d949d60e45b135f2613087.tar.gz busybox-w32-6e55663080e33d1856d949d60e45b135f2613087.tar.bz2 busybox-w32-6e55663080e33d1856d949d60e45b135f2613087.zip |
Merge branch 'origin/master' (early part)
Diffstat (limited to 'miscutils/hdparm.c')
-rw-r--r-- | miscutils/hdparm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c index 236b1749c..c6ca3af80 100644 --- a/miscutils/hdparm.c +++ b/miscutils/hdparm.c | |||
@@ -2055,8 +2055,8 @@ int hdparm_main(int argc, char **argv) | |||
2055 | #if ENABLE_FEATURE_HDPARM_HDIO_SCAN_HWIF | 2055 | #if ENABLE_FEATURE_HDPARM_HDIO_SCAN_HWIF |
2056 | if (c == 'R') { | 2056 | if (c == 'R') { |
2057 | scan_hwif = parse_opts_0_INTMAX(&hwif_data); | 2057 | scan_hwif = parse_opts_0_INTMAX(&hwif_data); |
2058 | hwif_ctrl = xatoi_u((argv[optind]) ? argv[optind] : ""); | 2058 | hwif_ctrl = xatoi_positive((argv[optind]) ? argv[optind] : ""); |
2059 | hwif_irq = xatoi_u((argv[optind+1]) ? argv[optind+1] : ""); | 2059 | hwif_irq = xatoi_positive((argv[optind+1]) ? argv[optind+1] : ""); |
2060 | /* Move past the 2 additional arguments */ | 2060 | /* Move past the 2 additional arguments */ |
2061 | argv += 2; | 2061 | argv += 2; |
2062 | argc -= 2; | 2062 | argc -= 2; |