From 860c517a709cd930b137a98b84bb5fb41a62d35f Mon Sep 17 00:00:00 2001 From: Maciej Trela Date: Thu, 21 Jun 2012 23:25:37 -0700 Subject: [PATCH] --- yaml --- r: 316805 b: refs/heads/master c: 36fed4980529b3d4090fcb677ad46b27e270be40 h: refs/heads/master i: 316803: 9b852196686e9fc1e579cdd517ab0b50824cf979 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libsas/sas_ata.c | 1 - trunk/drivers/scsi/libsas/sas_scsi_host.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9f9a07615187..140673456941 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57fc2e335fd3c2f898ee73570dc81426c28dc7b4 +refs/heads/master: 36fed4980529b3d4090fcb677ad46b27e270be40 diff --git a/trunk/drivers/scsi/libsas/sas_ata.c b/trunk/drivers/scsi/libsas/sas_ata.c index b035acf18730..bec3bc8aab0c 100644 --- a/trunk/drivers/scsi/libsas/sas_ata.c +++ b/trunk/drivers/scsi/libsas/sas_ata.c @@ -618,7 +618,6 @@ void sas_ata_task_abort(struct sas_task *task) spin_lock_irqsave(q->queue_lock, flags); blk_abort_request(qc->scsicmd->request); spin_unlock_irqrestore(q->queue_lock, flags); - scsi_schedule_eh(qc->scsicmd->device->host); return; } diff --git a/trunk/drivers/scsi/libsas/sas_scsi_host.c b/trunk/drivers/scsi/libsas/sas_scsi_host.c index a09da44e282b..52d5b0133db0 100644 --- a/trunk/drivers/scsi/libsas/sas_scsi_host.c +++ b/trunk/drivers/scsi/libsas/sas_scsi_host.c @@ -1018,7 +1018,6 @@ void sas_task_abort(struct sas_task *task) spin_lock_irqsave(q->queue_lock, flags); blk_abort_request(sc->request); spin_unlock_irqrestore(q->queue_lock, flags); - scsi_schedule_eh(sc->device->host); } }