diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2008-05-02 09:21:50 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-05-02 14:18:06 -0400 |
commit | 392512fbf9407fa1647225143e3f9c28a869ac57 (patch) | |
tree | 93976853e07f3a3fef525a00dd5a28cb640e823a /drivers | |
parent | 1ed43910956f5faec690ea3214451779e93bbb52 (diff) |
[SCSI] u14-34f: Fix 32bit only problem
Another user of 32bit time
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/scsi/u14-34f.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/u14-34f.c b/drivers/scsi/u14-34f.c index 640333b1e75c..329eb8780e74 100644 --- a/drivers/scsi/u14-34f.c +++ b/drivers/scsi/u14-34f.c | |||
@@ -744,7 +744,8 @@ static int wait_on_busy(unsigned long iobase, unsigned int loop) { | |||
744 | static int board_inquiry(unsigned int j) { | 744 | static int board_inquiry(unsigned int j) { |
745 | struct mscp *cpp; | 745 | struct mscp *cpp; |
746 | dma_addr_t id_dma_addr; | 746 | dma_addr_t id_dma_addr; |
747 | unsigned int time, limit = 0; | 747 | unsigned int limit = 0; |
748 | unsigned long time; | ||
748 | 749 | ||
749 | id_dma_addr = pci_map_single(HD(j)->pdev, HD(j)->board_id, | 750 | id_dma_addr = pci_map_single(HD(j)->pdev, HD(j)->board_id, |
750 | sizeof(HD(j)->board_id), PCI_DMA_BIDIRECTIONAL); | 751 | sizeof(HD(j)->board_id), PCI_DMA_BIDIRECTIONAL); |
@@ -1392,7 +1393,8 @@ static int u14_34f_eh_abort(struct scsi_cmnd *SCarg) { | |||
1392 | } | 1393 | } |
1393 | 1394 | ||
1394 | static int u14_34f_eh_host_reset(struct scsi_cmnd *SCarg) { | 1395 | static int u14_34f_eh_host_reset(struct scsi_cmnd *SCarg) { |
1395 | unsigned int i, j, time, k, c, limit = 0; | 1396 | unsigned int i, j, k, c, limit = 0; |
1397 | unsigned long time; | ||
1396 | int arg_done = FALSE; | 1398 | int arg_done = FALSE; |
1397 | struct scsi_cmnd *SCpnt; | 1399 | struct scsi_cmnd *SCpnt; |
1398 | 1400 | ||