thinko in 2.0.9 drivers/block/ide.c

Steve VanDevender (stevev@efn.org)
Fri, 26 Jul 1996 10:34:20 -0700


For some reason the variable hd_status was moved inside #ifdef
CONFIG_BLK_DEV_CMD640 by the 2.0.9 patch, but is still used in places
outside that config option. Would the following diff be the right thing
to do?

--- linux-2.0.9/drivers/block/ide.c Fri Jul 26 09:58:50 1996
+++ linux/drivers/block/ide.c Fri Jul 26 10:18:20 1996
@@ -2383,11 +2383,10 @@
*/
static int try_to_identify (ide_drive_t *drive, byte cmd)
{
- int irqs, rc;
+ int hd_status, irqs, rc;
unsigned long timeout;
#ifdef CONFIG_BLK_DEV_CMD640
int retry = 0;
- int hd_status;

try_again:
#endif /* CONFIG_BLK_DEV_CMD640 */