diff --git a/[refs] b/[refs] index a2c15ac18e4c..9ca11b14df4c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d0ad6f50399abc990adc4653c1eda5932b8adb52 +refs/heads/master: 0726ce26104671e3072d90b9c697c253974e823d diff --git a/trunk/drivers/scsi/ipr.c b/trunk/drivers/scsi/ipr.c index d47df3f9d226..63d01e6394a2 100644 --- a/trunk/drivers/scsi/ipr.c +++ b/trunk/drivers/scsi/ipr.c @@ -2789,8 +2789,10 @@ static int ipr_slave_configure(struct scsi_device *sdev) if (res) { if (ipr_is_af_dasd_device(res)) sdev->type = TYPE_RAID; - if (ipr_is_af_dasd_device(res) || ipr_is_ioa_resource(res)) + if (ipr_is_af_dasd_device(res) || ipr_is_ioa_resource(res)) { sdev->scsi_level = 4; + sdev->no_uld_attach = 1; + } if (ipr_is_vset_device(res)) { sdev->timeout = IPR_VSET_RW_TIMEOUT; blk_queue_max_sectors(sdev->request_queue, IPR_VSET_MAX_SECTORS);