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
[libata] ahci: add ATI SB800 PCI IDs
[pandora-kernel.git]
/
drivers
/
ata
/
pata_cs5520.c
diff --git
a/drivers/ata/pata_cs5520.c
b/drivers/ata/pata_cs5520.c
index
1aabe15
..
e245908
100644
(file)
--- a/
drivers/ata/pata_cs5520.c
+++ b/
drivers/ata/pata_cs5520.c
@@
-41,7
+41,7
@@
#include <linux/libata.h>
#define DRV_NAME "pata_cs5520"
#include <linux/libata.h>
#define DRV_NAME "pata_cs5520"
-#define DRV_VERSION "0.6.
5
"
+#define DRV_VERSION "0.6.
6
"
struct pio_clocks
{
struct pio_clocks
{
@@
-146,7
+146,7
@@
static struct scsi_host_template cs5520_sht = {
.queuecommand = ata_scsi_queuecmd,
.can_queue = ATA_DEF_QUEUE,
.this_id = ATA_SHT_THIS_ID,
.queuecommand = ata_scsi_queuecmd,
.can_queue = ATA_DEF_QUEUE,
.this_id = ATA_SHT_THIS_ID,
- .sg_tablesize = LIBATA_MAX_PRD,
+ .sg_tablesize = LIBATA_
DUMB_
MAX_PRD,
.cmd_per_lun = ATA_SHT_CMD_PER_LUN,
.emulated = ATA_SHT_EMULATED,
.use_clustering = ATA_SHT_USE_CLUSTERING,
.cmd_per_lun = ATA_SHT_CMD_PER_LUN,
.emulated = ATA_SHT_EMULATED,
.use_clustering = ATA_SHT_USE_CLUSTERING,
@@
-178,7
+178,7
@@
static struct ata_port_operations cs5520_port_ops = {
.bmdma_start = ata_bmdma_start,
.bmdma_stop = ata_bmdma_stop,
.bmdma_status = ata_bmdma_status,
.bmdma_start = ata_bmdma_start,
.bmdma_stop = ata_bmdma_stop,
.bmdma_status = ata_bmdma_status,
- .qc_prep = ata_qc_prep,
+ .qc_prep = ata_
dumb_
qc_prep,
.qc_issue = ata_qc_issue_prot,
.data_xfer = ata_data_xfer,
.qc_issue = ata_qc_issue_prot,
.data_xfer = ata_data_xfer,
@@
-275,7
+275,7
@@
static int __devinit cs5520_init_one(struct pci_dev *pdev, const struct pci_devi
for (i = 0; i < 2; i++) {
static const int irq[] = { 14, 15 };
for (i = 0; i < 2; i++) {
static const int irq[] = { 14, 15 };
- struct ata_port *ap = host->ports[
0
];
+ struct ata_port *ap = host->ports[
i
];
if (ata_port_is_dummy(ap))
continue;
if (ata_port_is_dummy(ap))
continue;
@@
-284,6
+284,11
@@
static int __devinit cs5520_init_one(struct pci_dev *pdev, const struct pci_devi
ata_interrupt, 0, DRV_NAME, host);
if (rc)
return rc;
ata_interrupt, 0, DRV_NAME, host);
if (rc)
return rc;
+
+ if (i == 0)
+ host->irq = irq[0];
+ else
+ host->irq2 = irq[1];
}
return ata_host_register(host, &cs5520_sht);
}
return ata_host_register(host, &cs5520_sht);