patch-2.2.11 linux/drivers/scsi/wd7000.c

Next file: linux/drivers/sgi/Config.in
Previous file: linux/drivers/scsi/wd33c93.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.2.10/linux/drivers/scsi/wd7000.c linux/drivers/scsi/wd7000.c
@@ -1561,19 +1561,16 @@
 			break;
 
 		if (i == pass) {
-#if (LINUX_VERSION_CODE < 0x020100)
-#else
 		    void *biosaddr = ioremap (wd7000_biosaddr[biosaddr_ptr] +
 			                      signatures[sig_ptr].ofs,
 					      signatures[sig_ptr].len);
-#endif
-		    short bios_match = memcmp ((char *) biosaddr, signatures[sig_ptr].sig,
+		    short bios_match=0;
+		    
+		    if(biosaddr)
+		    	bios_match = memcmp ((char *) biosaddr, signatures[sig_ptr].sig,
 			                       signatures[sig_ptr].len);
 
-#if (LINUX_VERSION_CODE < 0x020100)
-#else
 		    iounmap (biosaddr);
-#endif
 
 		    if (! bios_match)
 		        goto bios_matched;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)