Merge branch 'upstream'

1 files changed, 5 insertions, 2 deletions

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 2929282beb40..1be43be5b1d6 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -197,7 +197,7 @@ struct ata_port;
 struct ata_queued_cmd;
 
 /* typedefs */
-typedef int (*ata_qc_cb_t) (struct ata_queued_cmd *qc, unsigned int err_mask);
+typedef int (*ata_qc_cb_t) (struct ata_queued_cmd *qc);
 
 struct ata_ioports {
         unsigned long           cmd_addr;
@@ -282,6 +282,8 @@ struct ata_queued_cmd {
         /* DO NOT iterate over __sg manually, use ata_for_each_sg() */
         struct scatterlist      *__sg;
 
+        unsigned int            err_mask;
+
         ata_qc_cb_t             complete_fn;
 
         struct completion       *waiting;
@@ -476,7 +478,7 @@ extern void ata_bmdma_start (struct ata_queued_cmd *qc);
 extern void ata_bmdma_stop(struct ata_queued_cmd *qc);
 extern u8   ata_bmdma_status(struct ata_port *ap);
 extern void ata_bmdma_irq_clear(struct ata_port *ap);
-extern void ata_qc_complete(struct ata_queued_cmd *qc, unsigned int err_mask);
+extern void ata_qc_complete(struct ata_queued_cmd *qc);
 extern void ata_eng_timeout(struct ata_port *ap);
 extern void ata_scsi_simulate(u16 *id, struct scsi_cmnd *cmd,
                               void (*done)(struct scsi_cmnd *));
@@ -668,6 +670,7 @@ static inline void ata_qc_reinit(struct ata_queued_cmd *qc)
         qc->cursect = qc->cursg = qc->cursg_ofs = 0;
         qc->nsect = 0;
         qc->nbytes = qc->curbytes = 0;
+        qc->err_mask = 0;
 
         ata_tf_init(qc->ap, &qc->tf, qc->dev->devno);
 }