diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-01-03 10:58:00 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-01-03 10:58:00 +0800 |
| commit | 67f07b48af22065412ba4e78472121c0a9f58329 (patch) | |
| tree | 18e5148ef910dcab382a98ff7b46172da0bf13bc /drivers/scsi/megaraid | |
| parent | a5e9874fc9e05e8471bfd58cabd75a3432d38ba6 (diff) | |
| parent | 35327468a79dd9e343eaf7e66cc372f8277b2a84 (diff) | |
Merge tag 'v4.1.37' into linux-linaro-lsk-v4.1
This is the 4.1.37 stable release
Diffstat (limited to 'drivers/scsi/megaraid')
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_sas.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h index 14e5c7cea929..1fcd31c6b37b 100644 --- a/drivers/scsi/megaraid/megaraid_sas.h +++ b/drivers/scsi/megaraid/megaraid_sas.h @@ -1862,7 +1862,7 @@ struct megasas_instance_template { }; #define MEGASAS_IS_LOGICAL(scp) \ - (scp->device->channel < MEGASAS_MAX_PD_CHANNELS) ? 0 : 1 + ((scp->device->channel < MEGASAS_MAX_PD_CHANNELS) ? 0 : 1) #define MEGASAS_DEV_INDEX(inst, scp) \ ((scp->device->channel % 2) * MEGASAS_MAX_DEV_PER_CHANNEL) + \ |