From patchwork Wed Jul 8 12:09:24 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Kawasaki X-Patchwork-Id: 29590 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id C4769B7063 for ; Wed, 8 Jul 2009 22:10:11 +1000 (EST) Received: by ozlabs.org (Postfix) id A9360DDDB2; Wed, 8 Jul 2009 22:10:11 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 37924DDDB6 for ; Wed, 8 Jul 2009 22:10:11 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753785AbZGHMKF (ORCPT ); Wed, 8 Jul 2009 08:10:05 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753428AbZGHMKF (ORCPT ); Wed, 8 Jul 2009 08:10:05 -0400 Received: from userg500.nifty.com ([202.248.238.80]:25193 "EHLO userg500.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753275AbZGHMKE (ORCPT ); Wed, 8 Jul 2009 08:10:04 -0400 Received: from localhost.localdomain (eaoska167022.adsl.ppp.infoweb.ne.jp [219.116.16.22])by userg500.nifty.com with SMTP id n68C9hXG019990 for ; Wed, 8 Jul 2009 21:09:43 +0900 X-Nifty-SrcIP: [219.116.16.22] Date: Wed, 8 Jul 2009 21:09:24 +0900 From: Ken Kawasaki To: netdev@vger.kernel.org Subject: [PATCH] pcnet_cs: add odd location support for write_asic function Message-Id: <20090708210924.2a486a84.ken_kawasaki@spring.nifty.jp> In-Reply-To: <20090405094907.5f6a5fea.ken_kawasaki@spring.nifty.jp> References: <20090405094907.5f6a5fea.ken_kawasaki@spring.nifty.jp> X-Mailer: Sylpheed 2.3.1 (GTK+ 2.10.11; i386-redhat-linux-gnu) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Ken Kawasaki --- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- linux-2.6.31-rc1/drivers/net/pcmcia/pcnet_cs.c.orig 2009-06-27 10:15:47.000000000 +0900 +++ linux-2.6.31-rc1/drivers/net/pcmcia/pcnet_cs.c 2009-07-04 10:32:44.000000000 +0900 @@ -886,9 +886,10 @@ static void write_asic(unsigned int ioad outb_p(EE_ASIC|EE_CS|EE_DI|dataval, ee_addr); } // sync - outb(EE_ASIC|EE_CS, ee_addr); - outb(EE_ASIC|EE_CS|EE_CK, ee_addr); - outb(EE_ASIC|EE_CS, ee_addr); + dataval = (location & 1) ? EE_DO : 0; + outb(EE_ASIC|EE_CS|dataval, ee_addr); + outb(EE_ASIC|EE_CS|dataval|EE_CK, ee_addr); + outb(EE_ASIC|EE_CS|dataval, ee_addr); for (i = 15; i >= 0; i--) { dataval = (asic_data & (1 << i)) ? EE_ADOT : 0;