git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Replace 0xff.. with correct DMA_xBIT_MASK
[pandora-kernel.git]
/
drivers
/
scsi
/
qlogicfc.c
diff --git
a/drivers/scsi/qlogicfc.c
b/drivers/scsi/qlogicfc.c
index
94ef3f0
..
52b224a
100644
(file)
--- a/
drivers/scsi/qlogicfc.c
+++ b/
drivers/scsi/qlogicfc.c
@@
-61,6
+61,8
@@
#include <linux/unistd.h>
#include <linux/spinlock.h>
#include <linux/interrupt.h>
#include <linux/unistd.h>
#include <linux/spinlock.h>
#include <linux/interrupt.h>
+#include <linux/dma-mapping.h>
+#include <linux/jiffies.h>
#include <asm/io.h>
#include <asm/irq.h>
#include "scsi.h"
#include <asm/io.h>
#include <asm/irq.h>
#include "scsi.h"
@@
-737,8
+739,8
@@
static int isp2x00_detect(struct scsi_host_template * tmpt)
continue;
/* Try to configure DMA attributes. */
continue;
/* Try to configure DMA attributes. */
- if (pci_set_dma_mask(pdev,
0xffffffffffffffffULL
) &&
- pci_set_dma_mask(pdev,
0xffffffffULL
))
+ if (pci_set_dma_mask(pdev,
DMA_64BIT_MASK
) &&
+ pci_set_dma_mask(pdev,
DMA_32BIT_MASK
))
continue;
host = scsi_register(tmpt, sizeof(struct isp2x00_hostdata));
continue;
host = scsi_register(tmpt, sizeof(struct isp2x00_hostdata));
@@
-1325,7
+1327,7
@@
static int isp2x00_queuecommand(Scsi_Cmnd * Cmnd, void (*done) (Scsi_Cmnd *))
cmd->control_flags = cpu_to_le16(CFLAG_READ);
if (Cmnd->device->tagged_supported) {
cmd->control_flags = cpu_to_le16(CFLAG_READ);
if (Cmnd->device->tagged_supported) {
- if (
(jiffies - hostdata->tag_ages[Cmnd->device->id]) > (2 * ISP_TIMEOUT
)) {
+ if (
time_after(jiffies, hostdata->tag_ages[Cmnd->device->id] + (2 * ISP_TIMEOUT)
)) {
cmd->control_flags |= cpu_to_le16(CFLAG_ORDERED_TAG);
hostdata->tag_ages[Cmnd->device->id] = jiffies;
} else
cmd->control_flags |= cpu_to_le16(CFLAG_ORDERED_TAG);
hostdata->tag_ages[Cmnd->device->id] = jiffies;
} else