[SCSI] ipr: Prevent upper layer driver binding

[linux-2.6-omap-h63xx.git] / drivers / scsi / ipr.c

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index b5a2669518bae9decf1ad01ab88f17656b4d8220..63d01e6394a209293a93ebe69bb7dfaddb9a1362 100644 (file)
--- a/drivers/scsi/ipr.c
+++ b/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);
@@ -4111,7 +4113,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_af_dasd_device(res))
+               if (!IPR_IS_DASD_DEVICE(res->cfgte.std_inq_data))
                        continue;
 
                ipr_cmd->u.res = res;