git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
intelfb: add preliminary i2c support
[safe/jmp/linux-2.6]
/
drivers
/
scsi
/
dpt_i2o.c
diff --git
a/drivers/scsi/dpt_i2o.c
b/drivers/scsi/dpt_i2o.c
index
cdeb30b
..
b1b704a
100644
(file)
--- a/
drivers/scsi/dpt_i2o.c
+++ b/
drivers/scsi/dpt_i2o.c
@@
-57,6
+57,7
@@
MODULE_DESCRIPTION("Adaptec I2O RAID Driver");
#include <linux/reboot.h>
#include <linux/spinlock.h>
#include <linux/smp_lock.h>
#include <linux/reboot.h>
#include <linux/spinlock.h>
#include <linux/smp_lock.h>
+#include <linux/dma-mapping.h>
#include <linux/timer.h>
#include <linux/string.h>
#include <linux/timer.h>
#include <linux/string.h>
@@
-899,9
+900,15
@@
static int adpt_install_hba(struct scsi_host_template* sht, struct pci_dev* pDev
if(pci_enable_device(pDev)) {
return -EINVAL;
}
if(pci_enable_device(pDev)) {
return -EINVAL;
}
+
+ if (pci_request_regions(pDev, "dpt_i2o")) {
+ PERROR("dpti: adpt_config_hba: pci request region failed\n");
+ return -EINVAL;
+ }
+
pci_set_master(pDev);
pci_set_master(pDev);
- 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
))
return -EINVAL;
base_addr0_phys = pci_resource_start(pDev,0);
return -EINVAL;
base_addr0_phys = pci_resource_start(pDev,0);
@@
-924,10
+931,6
@@
static int adpt_install_hba(struct scsi_host_template* sht, struct pci_dev* pDev
raptorFlag = TRUE;
}
raptorFlag = TRUE;
}
- if (pci_request_regions(pDev, "dpt_i2o")) {
- PERROR("dpti: adpt_config_hba: pci request region failed\n");
- return -EINVAL;
- }
base_addr_virt = ioremap(base_addr0_phys,hba_map0_area_size);
if (!base_addr_virt) {
pci_release_regions(pDev);
base_addr_virt = ioremap(base_addr0_phys,hba_map0_area_size);
if (!base_addr_virt) {
pci_release_regions(pDev);