projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1ed4391
)
[SCSI] u14-34f: Fix 32bit only problem
author
Alan Cox
<alan@lxorguk.ukuu.org.uk>
Fri, 2 May 2008 13:21:50 +0000
(14:21 +0100)
committer
James Bottomley
<James.Bottomley@HansenPartnership.com>
Fri, 2 May 2008 18:18:06 +0000
(13:18 -0500)
Another user of 32bit time
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
drivers/scsi/u14-34f.c
patch
|
blob
|
history
diff --git
a/drivers/scsi/u14-34f.c
b/drivers/scsi/u14-34f.c
index 640333b1e75c9b32565bfeab8721ef566fb903c4..329eb8780e74f4c2335137acdd181e92d8c6e863 100644
(file)
--- 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;