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

Commit c14b8331 authored by Albert Lee's avatar Albert Lee Committed by Jeff Garzik
Browse files

[PATCH] libata: minor patch before moving err_mask 



  - add qc to ata_pio_poll()
  - reorder the initialization of qc in ata_pio_complete()

Signed-off-by: default avatarAlbert Lee <albertcc@tw.ibm.com>

===================
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent f38f2a2c

drivers/scsi/libata-core.c

+7 −3
Original line number Diff line number Diff line
@@ -2802,10 +2802,14 @@ void ata_poll_qc_complete(struct ata_queued_cmd *qc, unsigned int err_mask) 


static unsigned long ata_pio_poll(struct ata_port *ap)

{

	struct ata_queued_cmd *qc;

	u8 status;

	unsigned int poll_state = HSM_ST_UNKNOWN;

	unsigned int reg_state = HSM_ST_UNKNOWN;



	qc = ata_qc_from_tag(ap, ap->active_tag);

	assert(qc != NULL);



	switch (ap->hsm_task_state) {

	case HSM_ST:

	case HSM_ST_POLL:
@@ -2870,15 +2874,15 @@ static int ata_pio_complete (struct ata_port *ap) 
		}

	}



	qc = ata_qc_from_tag(ap, ap->active_tag);

	assert(qc != NULL);



	drv_stat = ata_wait_idle(ap);

	if (!ata_ok(drv_stat)) {

		ap->hsm_task_state = HSM_ST_ERR;

		return 0;

	}



	qc = ata_qc_from_tag(ap, ap->active_tag);

	assert(qc != NULL);



	ap->hsm_task_state = HSM_ST_IDLE;



	ata_poll_qc_complete(qc, 0);