[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: Albert Lee <albertcc@tw.ibm.com> =================== Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
parent
f38f2a2c6f
commit
c14b8331ec
|
@ -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)
|
static unsigned long ata_pio_poll(struct ata_port *ap)
|
||||||
{
|
{
|
||||||
|
struct ata_queued_cmd *qc;
|
||||||
u8 status;
|
u8 status;
|
||||||
unsigned int poll_state = HSM_ST_UNKNOWN;
|
unsigned int poll_state = HSM_ST_UNKNOWN;
|
||||||
unsigned int reg_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) {
|
switch (ap->hsm_task_state) {
|
||||||
case HSM_ST:
|
case HSM_ST:
|
||||||
case HSM_ST_POLL:
|
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);
|
drv_stat = ata_wait_idle(ap);
|
||||||
if (!ata_ok(drv_stat)) {
|
if (!ata_ok(drv_stat)) {
|
||||||
ap->hsm_task_state = HSM_ST_ERR;
|
ap->hsm_task_state = HSM_ST_ERR;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
qc = ata_qc_from_tag(ap, ap->active_tag);
|
|
||||||
assert(qc != NULL);
|
|
||||||
|
|
||||||
ap->hsm_task_state = HSM_ST_IDLE;
|
ap->hsm_task_state = HSM_ST_IDLE;
|
||||||
|
|
||||||
ata_poll_qc_complete(qc, 0);
|
ata_poll_qc_complete(qc, 0);
|
||||||
|
|
Loading…
Reference in New Issue