hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hpsa: Fix type ZBC conditional checks 

The device ID obtained from the inquiry can only be of a single type.
The original code places a check for TYPE_ZBC right after the check for
TYPE_DISK. Logically, if the first if statement sees a device of a
TYPE_DISK and moves on to the second statement checking if not TYPE_ZBC,
it will always hit the continue.

[mkp: Applied by hand]

Signed-off-by: Petros Koutoupis <petros@petroskoutoupis.com>
Acked-by: Don Brace <don.brace@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Petros Koutoupis 2016-05-09 13:44:10 -05:00 committed by Martin K. Petersen
parent d230823a1c
commit ff615f065a
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/scsi/hpsa.c
View File

@ -1665,9 +1665,8 @@ static void hpsa_figure_phys_disk_ptrs(struct ctlr_info *h,
for (j = 0; j < ndevices; j++) { for (j = 0; j < ndevices; j++) {
if (dev[j] == NULL) if (dev[j] == NULL)
continue; continue;
if (dev[j]->devtype != TYPE_DISK) if (dev[j]->devtype != TYPE_DISK &&
continue; dev[j]->devtype != TYPE_ZBC)
if (dev[j]->devtype != TYPE_ZBC)
continue; continue;
if (is_logical_device(dev[j])) if (is_logical_device(dev[j]))
continue; continue;
@ -1712,9 +1711,8 @@ static void hpsa_update_log_drive_phys_drive_ptrs(struct ctlr_info *h,
for (i = 0; i < ndevices; i++) { for (i = 0; i < ndevices; i++) {
if (dev[i] == NULL) if (dev[i] == NULL)
continue; continue;
if (dev[i]->devtype != TYPE_DISK) if (dev[i]->devtype != TYPE_DISK &&
continue; dev[i]->devtype != TYPE_ZBC)
if (dev[i]->devtype != TYPE_ZBC)
continue; continue;
if (!is_logical_device(dev[i])) if (!is_logical_device(dev[i]))
continue; continue;