reintroduced

diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c

index d2029a4..3fdf705 100644

--- a/drivers/ata/libata-eh.c

+++ b/drivers/ata/libata-eh.c

@@ -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)

 {

 	struct ata_port *ap = qc->ap;

-	struct request_queue *q = qc->scsicmd->device->request_queue;

+	struct request_queue *q;

 	unsigned long flags;

 	WARN_ON(!ap->ops->error_handler);

@@ -981,9 +981,12 @@ void ata_qc_schedule_eh(struct ata_queued_cmd *qc)

 	 * Note that ATA_QCFLAG_FAILED is unconditionally set after

 	 * this function completes.

 	 */

-	spin_lock_irqsave(q->queue_lock, flags);

-	blk_abort_request(qc->scsicmd->request);

-	spin_unlock_irqrestore(q->queue_lock, flags);

+	if (qc->scsicmd != NULL) {

+		q = qc->scsicmd->device->request_queue;

+		spin_lock_irqsave(q->queue_lock, flags);

+		blk_abort_request(qc->scsicmd->request);

+		spin_unlock_irqrestore(q->queue_lock, flags);

+	}

 }

 /**