Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S264191AbUFKQ0P (ORCPT ); Fri, 11 Jun 2004 12:26:15 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S264117AbUFKQRd (ORCPT ); Fri, 11 Jun 2004 12:17:33 -0400 Received: from mion.elka.pw.edu.pl ([194.29.160.35]:8089 "EHLO mion.elka.pw.edu.pl") by vger.kernel.org with ESMTP id S264119AbUFKQQJ (ORCPT ); Fri, 11 Jun 2004 12:16:09 -0400 From: Bartlomiej Zolnierkiewicz To: linux-ide@vger.kernel.org Subject: [PATCH] IDE update for 2.6.7-rc3 [7/12] Date: Fri, 11 Jun 2004 17:59:54 +0200 User-Agent: KMail/1.5.3 Cc: linux-kernel@vger.kernel.org, Jens Axboe MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200406111759.54209.bzolnier@elka.pw.edu.pl> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1308 Lines: 33 [PATCH] ide: fix ide-cd to not retry REQ_DRIVE_TASKFILE requests 'cat /proc/ide/hdx/identify' generates REQ_DRIVE_TASKFILE request (for WIN_PIDENTIFY command) even for devices controlled by ide-cd. All other drivers don't retry such requests. Signed-off-by: Bartlomiej Zolnierkiewicz linux-2.6.7-rc3-bzolnier/drivers/ide/ide-cd.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/ide/ide-cd.c~ide_cdrom_taskfile drivers/ide/ide-cd.c --- linux-2.6.7-rc3/drivers/ide/ide-cd.c~ide_cdrom_taskfile 2004-06-10 23:01:31.725338592 +0200 +++ linux-2.6.7-rc3-bzolnier/drivers/ide/ide-cd.c 2004-06-10 23:01:31.731337680 +0200 @@ -574,7 +574,7 @@ ide_startstop_t ide_cdrom_error (ide_dri if (drive == NULL || (rq = HWGROUP(drive)->rq) == NULL) return ide_stopped; /* retry only "normal" I/O: */ - if (rq->flags & (REQ_DRIVE_CMD | REQ_DRIVE_TASK)) { + if (rq->flags & (REQ_DRIVE_CMD | REQ_DRIVE_TASK | REQ_DRIVE_TASKFILE)) { rq->errors = 1; ide_end_drive_cmd(drive, stat, err); return ide_stopped; _ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/