aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorroel kluin <roel.kluin@gmail.com>2008-10-29 14:24:47 -0700
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-12-29 11:24:14 -0600
commit8d6dda7f0ce53c55ec14eb5eaa360d549641586b (patch)
treedbbbe196a28c005cb7500d2bc1ee3d953b1e2137 /drivers
parent237abac6ff093aa5cb64faf6f632c479e00a67be (diff)
[SCSI] u14-34f: fix scsi_dma_map failure case
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/u14-34f.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/u14-34f.c b/drivers/scsi/u14-34f.c
index 329eb8780e7..601e95141cb 100644
--- a/drivers/scsi/u14-34f.c
+++ b/drivers/scsi/u14-34f.c
@@ -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;