From 0ae8dceaebe3659ee0c3352c08125f403e77ebca Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Tue, 28 Sep 1999 22:25:29 +0000 Subject: Merge with 2.3.10. --- drivers/scsi/i60uscsi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/scsi/i60uscsi.c') diff --git a/drivers/scsi/i60uscsi.c b/drivers/scsi/i60uscsi.c index 6e8e650b0..bc5652a09 100644 --- a/drivers/scsi/i60uscsi.c +++ b/drivers/scsi/i60uscsi.c @@ -765,11 +765,11 @@ int Addinia100_into_Adapter_table(WORD wBIOS, WORD wBASE, BYTE bInterrupt, if (inia100_adpt[i].ADPT_BIOS < wBIOS) continue; if (inia100_adpt[i].ADPT_BIOS == wBIOS) { - if (inia100_adpt[i].ADPT_BASE == wBASE) + if (inia100_adpt[i].ADPT_BASE == wBASE) { if (inia100_adpt[i].ADPT_Bus != 0xFF) return (FAILURE); - else if (inia100_adpt[i].ADPT_BASE < wBASE) - continue; + } else if (inia100_adpt[i].ADPT_BASE < wBASE) + continue; } for (j = MAX_SUPPORTED_ADAPTERS - 1; j > i; j--) { inia100_adpt[j].ADPT_BASE = inia100_adpt[j - 1].ADPT_BASE; -- cgit v1.2.3