diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2014-12-02 12:07:30 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2014-12-02 18:26:52 +0100 |
| commit | 249b15ba6380830881b7863ca5dd3f33320adfdb (patch) | |
| tree | 8e475fe2d9cba9ff41af37522b3020da61fb6686 /drivers | |
| parent | scsi: add SPC-3 command definitions (diff) | |
| download | linux-249b15ba6380830881b7863ca5dd3f33320adfdb.tar.xz linux-249b15ba6380830881b7863ca5dd3f33320adfdb.zip | |
scsi: set fmt to NULL scsi_extd_sense_format() by default
One of the two callers passes an unintialized pointer as "fmt" and
expects it to be set to NULL if there is no format string. Let's make
this function work as expected.
Fixes: d811b848ebb7 ('scsi: use sdev as argument for sense code printing')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: James Bottomley <JBottomley@Parallels.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/constants.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c index aee62f60b43d..e2068a2621c4 100644 --- a/drivers/scsi/constants.c +++ b/drivers/scsi/constants.c @@ -1271,6 +1271,7 @@ scsi_extd_sense_format(unsigned char asc, unsigned char ascq, const char **fmt) int i; unsigned short code = ((asc << 8) | ascq); + *fmt = NULL; for (i = 0; additional[i].text; i++) if (additional[i].code12 == code) return additional[i].text; @@ -1282,6 +1283,8 @@ scsi_extd_sense_format(unsigned char asc, unsigned char ascq, const char **fmt) return additional2[i].str; } } +#else + *fmt = NULL; #endif return NULL; } |