From 98e6d00625809125db0b2b4c1211324d1ba0889f Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 15 Jul 2010 10:20:19 +0200 Subject: [PATCH] --- yaml --- r: 204247 b: refs/heads/master c: e84d96dbb0638186feb526c32810a3400f33d0c8 h: refs/heads/master i: 204245: 995bbe4201e6a328b457cb5a52e862d04e0046f8 204243: 00939f7ce9f4a6e777a418a3046098fee13695c8 204239: 420cd57ba4d52ed2b02e502d38168bed618049db v: v3 --- [refs] | 2 +- trunk/drivers/scsi/dpt_i2o.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a4bc3ad75379..b8149c7bf22e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32de596074592ee8593416c83347b5a787e825c5 +refs/heads/master: e84d96dbb0638186feb526c32810a3400f33d0c8 diff --git a/trunk/drivers/scsi/dpt_i2o.c b/trunk/drivers/scsi/dpt_i2o.c index f2d4df14c311..ffc1edf5e80d 100644 --- a/trunk/drivers/scsi/dpt_i2o.c +++ b/trunk/drivers/scsi/dpt_i2o.c @@ -2640,6 +2640,13 @@ static s32 adpt_i2o_reparse_lct(adpt_hba* pHba) continue; } bus_no = buf[0]>>16; + if (bus_no >= MAX_CHANNEL) { /* Something wrong skip it */ + printk(KERN_WARNING + "%s: Channel number %d out of range\n", + pHba->name, bus_no); + continue; + } + scsi_id = buf[1]; scsi_lun = (buf[2]>>8 )&0xff; pDev = pHba->channel[bus_no].device[scsi_id]; @@ -2668,10 +2675,6 @@ static s32 adpt_i2o_reparse_lct(adpt_hba* pHba) adpt_i2o_report_hba_unit(pHba, d); adpt_i2o_install_device(pHba, d); - if(bus_no >= MAX_CHANNEL) { // Something wrong skip it - printk(KERN_WARNING"%s: Channel number %d out of range \n", pHba->name, bus_no); - continue; - } pDev = pHba->channel[bus_no].device[scsi_id]; if( pDev == NULL){ pDev =