Skip to content

L
linux-elphel
Commit 4065d065 authored by Oleg Dzhimiev's avatar Oleg Dzhimiev
Browse files
Options

applied patch

parent 76d5797a
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
src/drivers/ata/libata-eh.c
View file @ 4065d065
...@@ -968,7 +968,7 @@ static void ata_eh_set_pending(struct ata_port *ap, int fastdrain) ...@@ -968,7 +968,7 @@ static void ata_eh_set_pending(struct ata_port *ap, int fastdrain)
void ata_qc_schedule_eh(struct ata_queued_cmd *qc) void ata_qc_schedule_eh(struct ata_queued_cmd *qc)
{ {
struct ata_port *ap = qc->ap; struct ata_port *ap = qc->ap;
struct request_queue *q = qc->scsicmd->device->request_queue; struct request_queue *q;
unsigned long flags; unsigned long flags;
WARN_ON(!ap->ops->error_handler); WARN_ON(!ap->ops->error_handler);
...@@ -981,9 +981,12 @@ void ata_qc_schedule_eh(struct ata_queued_cmd *qc) ...@@ -981,9 +981,12 @@ void ata_qc_schedule_eh(struct ata_queued_cmd *qc)
* Note that ATA_QCFLAG_FAILED is unconditionally set after * Note that ATA_QCFLAG_FAILED is unconditionally set after
* this function completes. * this function completes.
*/ */
spin_lock_irqsave(q->queue_lock, flags); if (qc->scsicmd != NULL) {
blk_abort_request(qc->scsicmd->request); q = qc->scsicmd->device->request_queue;
spin_unlock_irqrestore(q->queue_lock, flags); spin_lock_irqsave(q->queue_lock, flags);
blk_abort_request(qc->scsicmd->request);
spin_unlock_irqrestore(q->queue_lock, flags);
}
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment