[SCSI] ipr: Fixup device type check

Fixup a check used by the ipr driver to determine if a given
device is a SCSI disk. Due to the addition of support for
attaching SATA devices, this check needs to be more robust.

Signed-off-by: Brian King <brking@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 154b78c5baa8..20b6929cb4fe 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -3214,7 +3214,7 @@ static int ipr_slave_configure(struct scsi_device *sdev)
                         sdev->timeout = IPR_VSET_RW_TIMEOUT;
                         blk_queue_max_sectors(sdev->request_queue, IPR_VSET_MAX_SECTORS);
                 }
-                if (IPR_IS_DASD_DEVICE(res->cfgte.std_inq_data))
+                if (ipr_is_vset_device(res) || ipr_is_scsi_disk(res))
                         sdev->allow_restart = 1;
                 scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun);
         }
@@ -4540,7 +4540,7 @@ static int ipr_set_supported_devs(struct ipr_cmnd *ipr_cmd)
         ipr_cmd->job_step = ipr_ioa_reset_done;
 
         list_for_each_entry_continue(res, &ioa_cfg->used_res_q, queue) {
-                if (!IPR_IS_DASD_DEVICE(res->cfgte.std_inq_data))
+                if (!ipr_is_scsi_disk(res))
                         continue;
 
                 ipr_cmd->u.res = res;