]> err.no Git - linux-2.6/commitdiff
[SCSI] qla1280: fix 32 bit segment code
authorFUJITA Tomonori <tomof@acm.org>
Tue, 8 Jan 2008 14:07:01 +0000 (23:07 +0900)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Wed, 9 Jan 2008 21:06:07 +0000 (15:06 -0600)
There's an error remaining in the 32 bit descriptor code after the
conversion to dma accessors:  req_cnt is left uninitialised.

qla1280_32bit_start_scsi gives the following warnings:

drivers/scsi/qla1280.c: In function 'qla1280_32bit_start_scsi':
drivers/scsi/qla1280.c:3044: warning: unused variable 'dma_handle'
drivers/scsi/qla1280.c: In function 'qla1280_queuecommand':
drivers/scsi/qla1280.c:3060: warning: 'req_cnt' is used uninitialized in this function
drivers/scsi/qla1280.c:3042: note: 'req_cnt' was declared here

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
drivers/scsi/qla1280.c

index 146d540f6281fdd0917258fac03ae8c7eeef87e8..28864075609930af90875d2d17522be20899e239 100644 (file)
@@ -3041,7 +3041,6 @@ qla1280_32bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
        int cnt;
        int req_cnt;
        int seg_cnt;
-       dma_addr_t dma_handle;
        u8 dir;
 
        ENTER("qla1280_32bit_start_scsi");
@@ -3050,6 +3049,7 @@ qla1280_32bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
                cmd->cmnd[0]);
 
        /* Calculate number of entries and segments required. */
+       req_cnt = 1;
        seg_cnt = scsi_dma_map(cmd);
        if (seg_cnt) {
                /*