patch-2.4.25 linux-2.4.25/drivers/s390/block/xpram.c

Next file: linux-2.4.25/drivers/s390/ccwcache.c
Previous file: linux-2.4.25/drivers/s390/block/dasd_int.h
Back to the patch index
Back to the overall index

diff -urN linux-2.4.24/drivers/s390/block/xpram.c linux-2.4.25/drivers/s390/block/xpram.c
@@ -184,9 +184,7 @@
 		 "All devices with size 0 equally partition the "
 		 "remaining space on the expanded strorage not "
 		 "claimed by explicit sizes\n");
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,12))
-MODULE_LICENSE ("GPL");
-#endif
+MODULE_LICENSE("GPL");
 
 
 /* The following items are obtained through kmalloc() in init_module() */
@@ -273,7 +271,7 @@
 		return XPRAM_INVALF;
 	if ( (**strptr == '0') 
 	     && ( (*((*strptr)+1) == 'x') || (*((*strptr) +1) == 'X') ) 
-	     && isdigit(*((*strptr)+3)) ) {
+	     && isxdigit(*((*strptr)+2)) ) {
 		*strptr=(*strptr)+2;
 		return XPRAM_HEXF;
 	} else return XPRAM_DECF;

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