Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 278efe95 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

[libata] irq-pio: fix breakage related to err_mask merge

parent 701db69d

drivers/scsi/libata-core.c

+2 −1
Original line number Diff line number Diff line
@@ -4336,7 +4336,8 @@ inline unsigned int ata_host_intr (struct ata_port *ap, 
		       ap->id, status, host_stat);



		ap->hsm_task_state = HSM_ST_IDLE;

		ata_qc_complete(qc, status | ATA_ERR);

		qc->err_mask |= __ac_err_mask(status);

		ata_qc_complete(qc);

		break;

	default:

		goto idle_irq;

drivers/scsi/sata_mv.c

+1 −1
Original line number Diff line number Diff line
@@ -1244,7 +1244,7 @@ static void mv_host_intr(struct ata_host_set *host_set, u32 relevant, 
				/* mark qc status appropriately */

				if (!(qc->tf.flags & ATA_TFLAG_POLLING)) {

					qc->err_mask |= err_mask;

					ata_qc_complete(qc, err_mask);

					ata_qc_complete(qc);

				}

			}

		}