From patchwork Wed Dec 11 14:04:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Brodkin X-Patchwork-Id: 300094 X-Patchwork-Delegate: hs@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 856E92C0085 for ; Thu, 12 Dec 2013 01:05:09 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 914F74AD9E; Wed, 11 Dec 2013 15:05:06 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id U1QrHwUUy7sb; Wed, 11 Dec 2013 15:05:06 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 35CC34B111; Wed, 11 Dec 2013 15:05:04 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 75BD24B111 for ; Wed, 11 Dec 2013 15:05:02 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9CC5+GS7fBW2 for ; Wed, 11 Dec 2013 15:04:55 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from vaxjo.synopsys.com (vaxjo.synopsys.com [198.182.60.75]) by theia.denx.de (Postfix) with ESMTP id 552584B10F for ; Wed, 11 Dec 2013 15:04:46 +0100 (CET) Received: from WBSNus01mta2 (us01secmta2.synopsys.com [10.9.203.102]) by vaxjo.synopsys.com (Postfix) with ESMTP id 528E1DA64; Wed, 11 Dec 2013 06:04:45 -0800 (PST) Received: from us01secmta2.internal.synopsys.com (us01secmta2.internal.synopsys.com [127.0.0.1]) by us01secmta2.internal.synopsys.com (Service) with ESMTP id 3E491A4112; Wed, 11 Dec 2013 06:04:45 -0800 (PST) Received: from mailhost.synopsys.com (mailhost3.synopsys.com [10.12.238.238]) by us01secmta2.internal.synopsys.com (Service) with ESMTP id 16DF5A4102; Wed, 11 Dec 2013 06:04:45 -0800 (PST) Received: from mailhost.synopsys.com (localhost [127.0.0.1]) by mailhost.synopsys.com (Postfix) with ESMTP id 0987E636; Wed, 11 Dec 2013 06:04:45 -0800 (PST) Received: from abrodkin-8560l.internal.synopsys.com (unknown [10.225.15.76]) by mailhost.synopsys.com (Postfix) with ESMTP id 4B2BE632; Wed, 11 Dec 2013 06:04:42 -0800 (PST) From: Alexey Brodkin To: u-boot@lists.denx.de Date: Wed, 11 Dec 2013 18:04:40 +0400 Message-Id: <1386770680-12757-1-git-send-email-abrodkin@synopsys.com> X-Mailer: git-send-email 1.8.4.2 Cc: Tom Rini , Alexey Brodkin Subject: [U-Boot] [PATCH] env_eeprom - fix bus recovery for "eeprom_bus_read" X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de "env_eeprom_bus" is no longer in use (it was introduced in commit 548738b4d43af841ff58c787bce297ac6a8bf7d1 "cmd_eeprom: I2C updates"). As in "eeprom_bus_write" we just reset I2C bus with the one we saved in "old_bus". Signed-off-by: Alexey Brodkin Cc: Wolfgang Denk Cc: Tom Rini Cc: Heiko Schocher --- common/env_eeprom.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/common/env_eeprom.c b/common/env_eeprom.c index 0dcdd1f..0db2bb6 100644 --- a/common/env_eeprom.c +++ b/common/env_eeprom.c @@ -24,7 +24,6 @@ DECLARE_GLOBAL_DATA_PTR; env_t *env_ptr; char *env_name_spec = "EEPROM"; -int env_eeprom_bus = -1; static int eeprom_bus_read(unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cnt) @@ -40,8 +39,7 @@ static int eeprom_bus_read(unsigned dev_addr, unsigned offset, rcode = eeprom_read(dev_addr, offset, buffer, cnt); #if defined(CONFIG_I2C_ENV_EEPROM_BUS) - if (old_bus != env_eeprom_bus) - i2c_set_bus_num(old_bus); + i2c_set_bus_num(old_bus); #endif return rcode; @@ -63,6 +61,7 @@ static int eeprom_bus_write(unsigned dev_addr, unsigned offset, #if defined(CONFIG_I2C_ENV_EEPROM_BUS) i2c_set_bus_num(old_bus); #endif + return rcode; }