1 files changed, 17 insertions, 9 deletions

diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index b0c576f84b28..ffc1edf5e80d 100644
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -1290,7 +1290,7 @@ static int adpt_i2o_post_wait(adpt_hba* pHba, u32* msg, int len, int timeout)
         ulong flags = 0;
         struct adpt_i2o_post_wait_data *p1, *p2;
         struct adpt_i2o_post_wait_data *wait_data =
-                kmalloc(sizeof(struct adpt_i2o_post_wait_data),GFP_KERNEL);
+                kmalloc(sizeof(struct adpt_i2o_post_wait_data), GFP_ATOMIC);
         DECLARE_WAITQUEUE(wait, current);
 
         if (!wait_data)
@@ -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];
@@ -2651,7 +2658,8 @@ static s32 adpt_i2o_reparse_lct(adpt_hba* pHba)
                                 pDev = pDev->next_lun;
                         }
                         if(!pDev ) { // Something new add it
-                                d = kmalloc(sizeof(struct i2o_device), GFP_KERNEL);
+                                d = kmalloc(sizeof(struct i2o_device),
+                                            GFP_ATOMIC);
                                 if(d==NULL)
                                 {
                                         printk(KERN_CRIT "Out of memory for I2O device data.\n");
@@ -2667,13 +2675,11 @@ 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 =  kzalloc(sizeof(struct adpt_device),GFP_KERNEL);
+                                        pDev =
+                                          kzalloc(sizeof(struct adpt_device),
+                                                  GFP_ATOMIC);
                                         if(pDev == NULL) {
                                                 return -ENOMEM;
                                         }
@@ -2682,7 +2688,9 @@ static s32 adpt_i2o_reparse_lct(adpt_hba* pHba)
                                         while (pDev->next_lun) {
                                                 pDev = pDev->next_lun;
                                         }
-                                        pDev = pDev->next_lun = kzalloc(sizeof(struct adpt_device),GFP_KERNEL);
+                                        pDev = pDev->next_lun =
+                                          kzalloc(sizeof(struct adpt_device),
+                                                  GFP_ATOMIC);
                                         if(pDev == NULL) {
                                                 return -ENOMEM;
                                         }
@@ -3127,7 +3135,7 @@ static int adpt_i2o_lct_get(adpt_hba* pHba)
                 if (pHba->lct == NULL) {
                         pHba->lct = dma_alloc_coherent(&pHba->pDev->dev,
                                         pHba->lct_size, &pHba->lct_pa,
-                                        GFP_KERNEL);
+                                        GFP_ATOMIC);
                         if(pHba->lct == NULL) {
                                 printk(KERN_CRIT "%s: Lct Get failed. Out of memory.\n",
                                         pHba->name);