patch-1.3.15 linux/drivers/scsi/scsi.c

Next file: linux/drivers/scsi/scsi.h
Previous file: linux/drivers/scsi/hosts.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.14/linux/drivers/scsi/scsi.c linux/drivers/scsi/scsi.c
@@ -175,9 +175,9 @@
 #define BLIST_SINGLELUN 0x10
 
 struct dev_info{
-    char * vendor;
-    char * model;
-    char * revision; /* Latest revision known to be bad.  Not used yet */
+    const char * vendor;
+    const char * model;
+    const char * revision; /* Latest revision known to be bad.  Not used yet */
     unsigned flags;
 };
 
@@ -1267,7 +1267,7 @@
      * the completion function for the high level driver.
      */
     
-    memcpy ((void *) SCpnt->data_cmnd , (void *) cmnd, 12);
+    memcpy ((void *) SCpnt->data_cmnd , (const void *) cmnd, 12);
 #if 0
     SCpnt->host = host;
     SCpnt->channel = channel;
@@ -1282,7 +1282,7 @@
     SCpnt->done = done;
     SCpnt->timeout_per_command = timeout;
 
-    memcpy ((void *) SCpnt->cmnd , (void *) cmnd, 12);
+    memcpy ((void *) SCpnt->cmnd , (const void *) cmnd, 12);
     /* Zero the sense buffer.  Some host adapters automatically request
      * sense on error.  0 is not a valid sense code.  
      */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this