]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[SCSI] u14-34f: fix scsi_dma_map failure case
authorroel kluin <roel.kluin@gmail.com>
Wed, 29 Oct 2008 21:24:47 +0000 (14:24 -0700)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Mon, 29 Dec 2008 17:24:14 +0000 (11:24 -0600)
When unsigned, scsi_dma_map may return -ENOMEM without triggering BUG_ON()

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
drivers/scsi/u14-34f.c

index 329eb8780e74f4c2335137acdd181e92d8c6e863..601e95141cbe13e16570db74c9d826e0e6c864e5 100644 (file)
@@ -1111,7 +1111,8 @@ static int u14_34f_detect(struct scsi_host_template *tpnt) {
 
 static void map_dma(unsigned int i, unsigned int j) {
    unsigned int data_len = 0;
-   unsigned int k, count, pci_dir;
+   unsigned int k, pci_dir;
+   int count;
    struct scatterlist *sg;
    struct mscp *cpp;
    struct scsi_cmnd *SCpnt;