From patchwork Fri Jan 29 16:05:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 43941 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 69A86B7D2A for ; Sat, 30 Jan 2010 03:06:42 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752666Ab0A2QGF (ORCPT ); Fri, 29 Jan 2010 11:06:05 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753762Ab0A2QGD (ORCPT ); Fri, 29 Jan 2010 11:06:03 -0500 Received: from mail-fx0-f220.google.com ([209.85.220.220]:53041 "EHLO mail-fx0-f220.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752666Ab0A2QF6 (ORCPT ); Fri, 29 Jan 2010 11:05:58 -0500 Received: by mail-fx0-f220.google.com with SMTP id 20so2015120fxm.21 for ; Fri, 29 Jan 2010 08:05:57 -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=8xEpZRXYUWbF+RCwCtQ4f4/5m7GgYxQGzhOLT4WJhnc=; b=tpHWZTitqZWBdVMsNANr0izOtIf2MIA420WgJbc4KxmWuBl2UrvFFeFHktUMgzGJCh 5PpQvXbqTNIuu/lDAYiepxysGgRmpQVetQsyCKLww+pO09UijwULUs1L6Egwhhd+EQZA ZkhqpBDFvMvwEhzKFI7aDSVNPllVX1Xyw56Uo= 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=r8fwMTNlXln1w6fvtswp7Tt3KlA51ahAgr/v3MYeP0WJ1yb7K5Y1IWO1mWjSzCIqbP HR21051+s5nBHcL1jcCleaFZMgVHgf8BtDNgTAieryaM4618Zqj1xIdvTinwgvHHfGUw UMqnJ3lufT10jOySamc80B0LBYiY3VCvDMDD0= Received: by 10.223.144.85 with SMTP id y21mr840705fau.71.1264781157676; Fri, 29 Jan 2010 08:05:57 -0800 (PST) Received: from ?127.0.0.1? (chello089079027028.chello.pl [89.79.27.28]) by mx.google.com with ESMTPS id 16sm555004fxm.0.2010.01.29.08.05.57 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 29 Jan 2010 08:05:57 -0800 (PST) From: Bartlomiej Zolnierkiewicz To: linux-ide@vger.kernel.org Cc: Bartlomiej Zolnierkiewicz , linux-kernel@vger.kernel.org Date: Fri, 29 Jan 2010 17:05:51 +0100 Message-Id: <20100129160551.21495.52656.sendpatchset@localhost> In-Reply-To: <20100129160308.21495.14120.sendpatchset@localhost> References: <20100129160308.21495.14120.sendpatchset@localhost> Subject: [PATCH 25/68] it8213: always program control bits Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Bartlomiej Zolnierkiewicz Subject: [PATCH] it8213: always program control bits This matches behavior of libata pata_it8213 host driver. Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/ide/it8213.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 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/it8213.c =================================================================== --- a/drivers/ide/it8213.c +++ b/drivers/ide/it8213.c @@ -55,15 +55,13 @@ static void it8213_set_pio_mode(ide_hwif if (is_slave) { master_data |= 0x4000; master_data &= ~0x0070; - if (pio > 1) - master_data = master_data | (control << 4); + master_data = master_data | (control << 4); pci_read_config_byte(dev, slave_port, &slave_data); slave_data = slave_data & 0xf0; slave_data = slave_data | (timings[pio][0] << 2) | timings[pio][1]; } else { master_data &= ~0x3307; - if (pio > 1) - master_data = master_data | control; + master_data = master_data | control; master_data = master_data | (timings[pio][0] << 12) | (timings[pio][1] << 8); } pci_write_config_word(dev, master_port, master_data);