Merge branch 'for-linus' into for-2.6.33

Conflicts:
	block/cfq-iosched.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

1 files changed, 10 insertions, 5 deletions

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 0ddaf43d68c6..d7f0f1b1ae3e 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -5028,12 +5028,14 @@ void ata_qc_complete(struct ata_queued_cmd *qc)
                         qc->flags |= ATA_QCFLAG_FAILED;
 
                 if (unlikely(qc->flags & ATA_QCFLAG_FAILED)) {
-                        if (!ata_tag_internal(qc->tag)) {
-                                /* always fill result TF for failed qc */
-                                fill_result_tf(qc);
+                        /* always fill result TF for failed qc */
+                        fill_result_tf(qc);
+
+                        if (!ata_tag_internal(qc->tag))
                                 ata_qc_schedule_eh(qc);
-                                return;
-                        }
+                        else
+                                __ata_qc_complete(qc);
+                        return;
                 }
 
                 WARN_ON_ONCE(ap->pflags & ATA_PFLAG_FROZEN);
@@ -5591,6 +5593,9 @@ void ata_link_init(struct ata_port *ap, struct ata_link *link, int pmp)
 
                 dev->link = link;
                 dev->devno = dev - link->device;
+#ifdef CONFIG_ATA_ACPI
+                dev->gtf_filter = ata_acpi_gtf_filter;
+#endif
                 ata_dev_init(dev);
         }
 }