patch-2.4.0-test11 linux/drivers/block/cpqarray.c

• Lines: 29
• Date: Thu Nov 16 11:30:29 2000
• Orig file: v2.4.0-test10/linux/drivers/block/cpqarray.c
• Orig date: Tue Oct 31 12:42:26 2000

diff -u --recursive --new-file v2.4.0-test10/linux/drivers/block/cpqarray.c linux/drivers/block/cpqarray.c
@@ -44,8 +44,8 @@
 
 #define SMART2_DRIVER_VERSION(maj,min,submin) ((maj<<16)|(min<<8)|(submin))
 
-#define DRIVER_NAME "Compaq SMART2 Driver (v 2.4.0)"
-#define DRIVER_VERSION SMART2_DRIVER_VERSION(2,4,0)
+#define DRIVER_NAME "Compaq SMART2 Driver (v 2.4.1)"
+#define DRIVER_VERSION SMART2_DRIVER_VERSION(2,4,1)
 
 /* Embedded module documentation macros - see modules.h */
 /* Original author Chris Frantz - Compaq Computer Corporation */
@@ -1664,6 +1664,7 @@
 	int ret_code, size;
 	drv_info_t *drv;
 	ctlr_info_t *info_p = hba[ctlr];
+	int i;
 
 	info_p->log_drv_map = 0;	
 	
@@ -1729,7 +1730,8 @@
         }
 
 	info_p->log_drives = id_ctlr_buf->nr_drvs;;
-	*(__u32*)(info_p->firm_rev) = *(__u32*)(id_ctlr_buf->firm_rev);
+	for(i=0;i<4;i++)
+		info_p->firm_rev[i] = id_ctlr_buf->firm_rev[i];
 	info_p->ctlr_sig = id_ctlr_buf->cfg_sig;
 
 	printk(" (%s)\n", info_p->product_name);