diff options
| author | roel kluin <roel.kluin@gmail.com> | 2008-10-29 17:24:47 -0400 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-12-29 12:24:14 -0500 |
| commit | 8d6dda7f0ce53c55ec14eb5eaa360d549641586b (patch) | |
| tree | dbbbe196a28c005cb7500d2bc1ee3d953b1e2137 | |
| parent | 237abac6ff093aa5cb64faf6f632c479e00a67be (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>
| -rw-r--r-- | drivers/scsi/u14-34f.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/u14-34f.c b/drivers/scsi/u14-34f.c index 329eb8780e74..601e95141cbe 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) { | |||
| 1111 | 1111 | ||
| 1112 | static void map_dma(unsigned int i, unsigned int j) { | 1112 | static void map_dma(unsigned int i, unsigned int j) { |
| 1113 | unsigned int data_len = 0; | 1113 | unsigned int data_len = 0; |
| 1114 | unsigned int k, count, pci_dir; | 1114 | unsigned int k, pci_dir; |
| 1115 | int count; | ||
| 1115 | struct scatterlist *sg; | 1116 | struct scatterlist *sg; |
| 1116 | struct mscp *cpp; | 1117 | struct mscp *cpp; |
| 1117 | struct scsi_cmnd *SCpnt; | 1118 | struct scsi_cmnd *SCpnt; |