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
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[pandora-kernel.git]
/
drivers
/
ata
/
sata_nv.c
diff --git
a/drivers/ata/sata_nv.c
b/drivers/ata/sata_nv.c
index
baa8f0d
..
6fd1147
100644
(file)
--- a/
drivers/ata/sata_nv.c
+++ b/
drivers/ata/sata_nv.c
@@
-920,7
+920,7
@@
static int nv_host_intr(struct ata_port *ap, u8 irq_stat)
}
/* handle interrupt */
}
/* handle interrupt */
- return ata_
sff_hos
t_intr(ap, qc);
+ return ata_
bmdma_por
t_intr(ap, qc);
}
static irqreturn_t nv_adma_interrupt(int irq, void *dev_instance)
}
static irqreturn_t nv_adma_interrupt(int irq, void *dev_instance)
@@
-1100,7
+1100,7
@@
static void nv_adma_irq_clear(struct ata_port *ap)
u32 notifier_clears[2];
if (pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE) {
u32 notifier_clears[2];
if (pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE) {
- ata_
sff
_irq_clear(ap);
+ ata_
bmdma
_irq_clear(ap);
return;
}
return;
}
@@
-1505,7
+1505,7
@@
static irqreturn_t nv_generic_interrupt(int irq, void *dev_instance)
qc = ata_qc_from_tag(ap, ap->link.active_tag);
if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING))) {
qc = ata_qc_from_tag(ap, ap->link.active_tag);
if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING))) {
- handled += ata_
sff_hos
t_intr(ap, qc);
+ handled += ata_
bmdma_por
t_intr(ap, qc);
} else {
/*
* No request pending? Clear interrupt status
} else {
/*
* No request pending? Clear interrupt status
@@
-2430,7
+2430,7
@@
static int nv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
ppi[0] = &nv_port_info[type];
ipriv = ppi[0]->private_data;
ppi[0] = &nv_port_info[type];
ipriv = ppi[0]->private_data;
- rc = ata_pci_
sff
_prepare_host(pdev, ppi, &host);
+ rc = ata_pci_
bmdma
_prepare_host(pdev, ppi, &host);
if (rc)
return rc;
if (rc)
return rc;