aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-04-05 16:37:25 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-04-05 16:37:25 +0000
commit061fd0a353ef05de4a96e23c18e25316babee523 (patch)
treedfdbf63824231a336f4c003bc29e3e14ea5ceb27
parentfa939aae8178b1675e6fa118c7da05ae575f87cd (diff)
downloadbusybox-w32-061fd0a353ef05de4a96e23c18e25316babee523.tar.gz
busybox-w32-061fd0a353ef05de4a96e23c18e25316babee523.tar.bz2
busybox-w32-061fd0a353ef05de4a96e23c18e25316babee523.zip
- make sure that the label expected_hwif_error is visible even when
CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF isn't set.
-rw-r--r--miscutils/hdparm.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index ca60dcf37..34b02552f 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -7,21 +7,7 @@
7 * 7 *
8 * Hacked by Tito <farmatito@tiscali.it> for size optimization. 8 * Hacked by Tito <farmatito@tiscali.it> for size optimization.
9 * 9 *
10 * This program is free software; you can redistribute it and/or modify 10 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
11 * it under the terms of the GNU General Public License as published by
12 * the Free Software Foundation; either version 2 of the License, or
13 * (at your option) any later version.
14 *
15 * This program is distributed in the hope that it will be useful,
16 * but WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18 * General Public License for more details.
19 *
20 * You should have received a copy of the GNU General Public License
21 * along with this program; if not, write to the Free Software
22 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
23 * 02111-1307 USA
24 *
25 * 11 *
26 * This program is based on the source code of hdparm: see below... 12 * This program is based on the source code of hdparm: see below...
27 * hdparm.c - Command line interface to get/set hard disk parameters 13 * hdparm.c - Command line interface to get/set hard disk parameters
@@ -2785,8 +2771,10 @@ missing_arg_error:
2785 if (argc && isdigit(**argv)) 2771 if (argc && isdigit(**argv))
2786 p = *argv++, --argc; 2772 p = *argv++, --argc;
2787 else 2773 else
2774#endif /* CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF */
2788expected_hwif_error: 2775expected_hwif_error:
2789 bb_error_msg_and_die("expected hwif value"); /* "expected hwif_irq" */ 2776 bb_error_msg_and_die("expected hwif value"); /* "expected hwif_irq" */
2777#ifdef CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF
2790 2778
2791 sscanf(p, "%i", &hwif_irq); 2779 sscanf(p, "%i", &hwif_irq);
2792 2780