diff options
author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-01-08 00:51:13 +0100 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-01-08 00:51:13 +0100 |
commit | abaee091a18c19ccd86feb1c8374585d82e96777 (patch) | |
tree | 01602bae73e1278c3d98dafe1c269049927c58ce /drivers/scsi/mvsas | |
parent | cxlflash: Enable device id for future IBM CXL adapter (diff) | |
parent | ses: fix discovery of SATA devices in SAS enclosures (diff) | |
download | linux-abaee091a18c19ccd86feb1c8374585d82e96777.tar.xz linux-abaee091a18c19ccd86feb1c8374585d82e96777.zip |
Merge branch 'jejb-scsi' into misc
Diffstat (limited to 'drivers/scsi/mvsas')
-rw-r--r-- | drivers/scsi/mvsas/mv_init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c index 6110ef3bfa92..c7c250519c4b 100644 --- a/drivers/scsi/mvsas/mv_init.c +++ b/drivers/scsi/mvsas/mv_init.c @@ -760,7 +760,7 @@ mvs_store_interrupt_coalescing(struct device *cdev, struct device_attribute *attr, const char *buffer, size_t size) { - int val = 0; + unsigned int val = 0; struct mvs_info *mvi = NULL; struct Scsi_Host *shost = class_to_shost(cdev); struct sas_ha_struct *sha = SHOST_TO_SAS_HA(shost); @@ -768,7 +768,7 @@ mvs_store_interrupt_coalescing(struct device *cdev, if (buffer == NULL) return size; - if (sscanf(buffer, "%d", &val) != 1) + if (sscanf(buffer, "%u", &val) != 1) return -EINVAL; if (val >= 0x10000) { |