|
|
@@ -63,7 +63,7 @@ Signed-off-by: Daniel Golle <[email protected]>
|
|
|
/**
|
|
|
* ata_build_rw_tf - Build ATA taskfile for given read/write request
|
|
|
* @qc: Metadata associated with the taskfile to build
|
|
|
-@@ -4767,6 +4778,9 @@ void __ata_qc_complete(struct ata_queued
|
|
|
+@@ -4770,6 +4781,9 @@ void __ata_qc_complete(struct ata_queued
|
|
|
link->active_tag = ATA_TAG_POISON;
|
|
|
ap->nr_active_links--;
|
|
|
}
|
|
|
@@ -73,7 +73,7 @@ Signed-off-by: Daniel Golle <[email protected]>
|
|
|
|
|
|
/* clear exclusive status */
|
|
|
if (unlikely(qc->flags & ATA_QCFLAG_CLEAR_EXCL &&
|
|
|
-@@ -5489,6 +5503,9 @@ struct ata_port *ata_port_alloc(struct a
|
|
|
+@@ -5492,6 +5506,9 @@ struct ata_port *ata_port_alloc(struct a
|
|
|
ap->stats.unhandled_irq = 1;
|
|
|
ap->stats.idle_irq = 1;
|
|
|
#endif
|
|
|
@@ -83,7 +83,7 @@ Signed-off-by: Daniel Golle <[email protected]>
|
|
|
ata_sff_port_init(ap);
|
|
|
|
|
|
ata_force_pflags(ap);
|
|
|
-@@ -5505,6 +5522,12 @@ void ata_port_free(struct ata_port *ap)
|
|
|
+@@ -5508,6 +5525,12 @@ void ata_port_free(struct ata_port *ap)
|
|
|
kfree(ap->pmp_link);
|
|
|
kfree(ap->slave_link);
|
|
|
ida_free(&ata_ida, ap->print_id);
|
|
|
@@ -96,7 +96,7 @@ Signed-off-by: Daniel Golle <[email protected]>
|
|
|
kfree(ap);
|
|
|
}
|
|
|
EXPORT_SYMBOL_GPL(ata_port_free);
|
|
|
-@@ -5909,7 +5932,23 @@ int ata_host_register(struct ata_host *h
|
|
|
+@@ -5912,7 +5935,23 @@ int ata_host_register(struct ata_host *h
|
|
|
WARN_ON(1);
|
|
|
return -EINVAL;
|
|
|
}
|