[PATCH] ide_setup eating all 2 letter boot args

From: Paul Gortmaker (p_gortmaker@yahoo.com)
Date: Sun Jul 09 2000 - 02:38:46 EST


Between test3-pre4 and pre5 the following was added to ide_setup:

if ( ... && (strncmp(s,"hd",2) && s[2] != '=')) return 0;

This line causes ide.c to think all two char boot args are for it, e.g.

ide_setup: sb=0x220,5,1,1 -- BAD OPTION

(and of course then the sound blaster driver complains that it
didn't get the mandatory i/o, irq and dma settings...)

Patch against test3-pre6.

Paul.

--- linux-g/drivers/ide/ide.c~ Fri Jul 7 03:49:05 2000
+++ linux-g/drivers/ide/ide.c Sun Jul 9 02:38:25 2000
@@ -2858,13 +2858,16 @@
         const char max_drive = 'a' + ((MAX_HWIFS * MAX_DRIVES) - 1);
         const char max_hwif = '0' + (MAX_HWIFS - 1);
 
+
+ if (strncmp(s,"hd",2) == 0 && s[2] == '=') /* hd= is for hd.c */
+ return 0; /* driver and not us */
+
         if (strncmp(s,"ide",3) &&
             strncmp(s,"idebus",6) &&
 #ifdef CONFIG_BLK_DEV_VIA82CXXX
             strncmp(s,"splitfifo",9) &&
 #endif /* CONFIG_BLK_DEV_VIA82CXXX */
- strncmp(s,"hdxlun",6) &&
- (strncmp(s,"hd",2) && s[2] != '='))
+ strncmp(s,"hd",2)) /* hdx= & hdxlun= */
                 return 0;
 
         printk("ide_setup: %s", s);

__________________________________________________
Do You Yahoo!?
Talk to your friends online with Yahoo! Messenger.
http://im.yahoo.com

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Sat Jul 15 2000 - 21:00:09 EST