3 files changed, 8 insertions, 6 deletions

diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c
index e69477d1889b..f01ec0a7c506 100644
--- a/drivers/scsi/scsi_devinfo.c
+++ b/drivers/scsi/scsi_devinfo.c
@@ -354,8 +354,9 @@ static int scsi_dev_info_list_add_str(char *dev_list)
  *     @model, if found, return the matching flags value, else return
  *     the host or global default settings.
  **/
-int scsi_get_device_flags(struct scsi_device *sdev, unsigned char *vendor,
-                          unsigned char *model)
+int scsi_get_device_flags(struct scsi_device *sdev,
+                          const unsigned char *vendor,
+                          const unsigned char *model)
 {
         struct scsi_dev_info_list *devinfo;
         unsigned int bflags;
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
index d632d9e1493c..a8d121c8fbcd 100644
--- a/drivers/scsi/scsi_priv.h
+++ b/drivers/scsi/scsi_priv.h
@@ -57,7 +57,8 @@ static inline void scsi_log_completion(struct scsi_cmnd *cmd, int disposition)
 
 /* scsi_devinfo.c */
 extern int scsi_get_device_flags(struct scsi_device *sdev,
-                                 unsigned char *vendor, unsigned char *model);
+                                 const unsigned char *vendor,
+                                 const unsigned char *model);
 extern int __init scsi_init_devinfo(void);
 extern void scsi_exit_devinfo(void);
 
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 85cfd88461c8..063e32fe036c 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -79,9 +79,9 @@ struct scsi_device {
         char inq_periph_qual;   /* PQ from INQUIRY data */      
         unsigned char inquiry_len;      /* valid bytes in 'inquiry' */
         unsigned char * inquiry;        /* INQUIRY response data */
-        char * vendor;          /* [back_compat] point into 'inquiry' ... */
-        char * model;           /* ... after scan; point to static string */
-        char * rev;             /* ... "nullnullnullnull" before scan */
+        const char * vendor;            /* [back_compat] point into 'inquiry' ... */
+        const char * model;             /* ... after scan; point to static string */
+        const char * rev;               /* ... "nullnullnullnull" before scan */
         unsigned char current_tag;      /* current tag */
         struct scsi_target      *sdev_target;   /* used only for single_lun */