The Coverity checker noted that we'll anyway Oops later when we ran into 
this condition - and the error check didn't prevent that.

Considering that the error condition shouldn't be possible, and we are 
not able to handle it easily, this patch simply removes the pointless 
error check.

Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>

---

This patch has been sent on:
- 23 Jul 2007

 drivers/scsi/nsp32.c |    4 ----
 1 file changed, 4 deletions(-)

--- linux-2.6.22-rc6-mm1/drivers/scsi/nsp32.c.old       2007-07-23 
19:38:58.000000000 +0200
+++ linux-2.6.22-rc6-mm1/drivers/scsi/nsp32.c   2007-07-23 20:17:14.000000000 
+0200
@@ -1888,44 +1888,40 @@ static void nsp32_msgout_occur(struct sc
 
        data->msgout_len = 0;
 
        nsp32_dbg(NSP32_DEBUG_MSGOUTOCCUR, "exit");
 }
 
 /*
  * Restart AutoSCSI
  *
  * Note: Restarting AutoSCSI needs set:
  *             SYNC_REG, ACK_WIDTH, SGT_ADR, TRANSFER_CONTROL
  */
 static void nsp32_restart_autoscsi(struct scsi_cmnd *SCpnt, unsigned short 
command)
 {
        nsp32_hw_data *data = (nsp32_hw_data *)SCpnt->device->host->hostdata;
        unsigned int   base = data->BaseAddress;
        unsigned short transfer = 0;
 
        nsp32_dbg(NSP32_DEBUG_RESTART, "enter");
 
-       if (data->cur_target == NULL || data->cur_lunt == NULL) {
-               nsp32_msg(KERN_ERR, "Target or Lun is invalid");
-       }
-
        /*
         * set SYNC_REG
         * Don't set BM_START_ADR before setting this register.
         */
        nsp32_write1(base, SYNC_REG, data->cur_target->syncreg);
 
        /*
         * set ACKWIDTH
         */
        nsp32_write1(base, ACK_WIDTH, data->cur_target->ackwidth);
 
        /*
         * set SREQ hazard killer sampling rate
         */
        nsp32_write1(base, SREQ_SMPL_RATE, data->cur_target->sample_reg);
 
        /*
         * set SGT ADDR (physical address)
         */
        nsp32_write4(base, SGT_ADR, data->cur_lunt->sglun_paddr);

-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to