diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2008-05-02 14:21:50 +0100 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-05-02 13:18:06 -0500 |
commit | 392512fbf9407fa1647225143e3f9c28a869ac57 (patch) | |
tree | 93976853e07f3a3fef525a00dd5a28cb640e823a /drivers/scsi | |
parent | 1ed43910956f5faec690ea3214451779e93bbb52 (diff) | |
download | op-kernel-dev-392512fbf9407fa1647225143e3f9c28a869ac57.zip op-kernel-dev-392512fbf9407fa1647225143e3f9c28a869ac57.tar.gz |
[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/scsi')
-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 640333b..329eb87 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) { static int board_inquiry(unsigned int j) { struct mscp *cpp; dma_addr_t id_dma_addr; - unsigned int time, limit = 0; + unsigned int limit = 0; + unsigned long time; id_dma_addr = pci_map_single(HD(j)->pdev, HD(j)->board_id, sizeof(HD(j)->board_id), PCI_DMA_BIDIRECTIONAL); @@ -1392,7 +1393,8 @@ static int u14_34f_eh_abort(struct scsi_cmnd *SCarg) { } static int u14_34f_eh_host_reset(struct scsi_cmnd *SCarg) { - unsigned int i, j, time, k, c, limit = 0; + unsigned int i, j, k, c, limit = 0; + unsigned long time; int arg_done = FALSE; struct scsi_cmnd *SCpnt; |