From patchwork Mon Jan 18 17:17:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 43094 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id EA234B7CCD for ; Tue, 19 Jan 2010 04:20:10 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754907Ab0ARRSg (ORCPT ); Mon, 18 Jan 2010 12:18:36 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754910Ab0ARRSf (ORCPT ); Mon, 18 Jan 2010 12:18:35 -0500 Received: from fg-out-1718.google.com ([72.14.220.154]:29622 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754907Ab0ARRSc (ORCPT ); Mon, 18 Jan 2010 12:18:32 -0500 Received: by fg-out-1718.google.com with SMTP id 22so796916fge.1 for ; Mon, 18 Jan 2010 09:18:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:date:message-id :in-reply-to:references:subject; bh=7YmaJSgJlaUYYL+SuNuB5VNIcwM6TRvCZir0X6sO+PI=; b=InVVXB+vnZRRrzQEDlHHKXUKBSr8jNRrdBJjWLwngWcAx0L/DRh+xH8YLB2aN8oFsw OYf4XYjj8CTa0ESNBjv7ErZN1PqHgHvqe1NYJk4ZeauF47U9OkQ0U6Dwx6sZBdXhPIQz 6Bbe+Bhlc4qAt1yyaFO0XCoeyEH3KndyrlWq8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:in-reply-to:references:subject; b=r21DY0FNvm01uQ0MLdz8HJ9j3HeKBiWVK9WG8l5a2KMRCDBFJbV5v0eQkRnNvosdbp iOCguGmp94mdzNTtV7rQ5DBHfwtXYjW9WDH8KqKqNz9gQQNTnuE4A/vXyvI5v8qqFOTU sjWmK1SjAWcYf8rzQeDvhDs/n0xnf/xKGmQ6o= Received: by 10.216.90.76 with SMTP id d54mr2327479wef.55.1263835111283; Mon, 18 Jan 2010 09:18:31 -0800 (PST) Received: from ?127.0.0.1? (chello089079027028.chello.pl [89.79.27.28]) by mx.google.com with ESMTPS id j8sm6606818gvb.17.2010.01.18.09.18.28 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 18 Jan 2010 09:18:29 -0800 (PST) From: Bartlomiej Zolnierkiewicz To: linux-ide@vger.kernel.org Cc: Bartlomiej Zolnierkiewicz , linux-kernel@vger.kernel.org Date: Mon, 18 Jan 2010 18:17:20 +0100 Message-Id: <20100118171720.14623.86072.sendpatchset@localhost> In-Reply-To: <20100118171349.14623.90030.sendpatchset@localhost> References: <20100118171349.14623.90030.sendpatchset@localhost> Subject: [PATCH 24/64] ide: fix for ide_timing quantisation errors Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Bartlomiej Zolnierkiewicz Subject: [PATCH] ide: fix for ide_timing quantisation errors Based on commit 4f701d1 for libata. Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/ide/ide-timings.c | 6 ++++++ 1 file changed, 6 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: b/drivers/ide/ide-timings.c =================================================================== --- a/drivers/ide/ide-timings.c +++ b/drivers/ide/ide-timings.c @@ -206,6 +206,12 @@ int ide_timing_compute(ide_drive_t *driv t->recover = t->cycle - t->active; } + /* In a few cases quantisation may produce enough errors to + leave t->cycle too low for the sum of active and recovery + if so we must correct this */ + if (t->active + t->recover > t->cycle) + t->cycle = t->active + t->recover; + return 0; } EXPORT_SYMBOL_GPL(ide_timing_compute);