From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761964AbcINNYd (ORCPT ); Wed, 14 Sep 2016 09:24:33 -0400 Received: from mail-he1eur01on0101.outbound.protection.outlook.com ([104.47.0.101]:43952 "EHLO EUR01-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757910AbcINNY3 (ORCPT ); Wed, 14 Sep 2016 09:24:29 -0400 X-Greylist: delayed 82067 seconds by postgrey-1.27 at vger.kernel.org; Wed, 14 Sep 2016 09:24:28 EDT Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; From: Peter Rosin To: "open list:I2C MUXES" CC: Peter Rosin , Wolfram Sang , open list Subject: [PATCH] i2c: i2c-mux-pca954x: retry updating the mux selection on failure Date: Wed, 14 Sep 2016 15:24:12 +0200 Message-ID: <1473859452-8069-1-git-send-email-peda@axentia.se> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [217.210.101.82] X-ClientProxiedBy: DB3PR08CA0036.eurprd08.prod.outlook.com (10.161.51.174) To HE1PR0201MB2314.eurprd02.prod.outlook.com (10.168.145.149) X-MS-Office365-Filtering-Correlation-Id: 5323de3e-e5cd-4d07-91d2-08d3dca2728d X-Microsoft-Exchange-Diagnostics: 1;HE1PR0201MB2314;2:m4dQwjCa8O/D9piIg50wpBP14CIo/4BVT3cJ2dj0TDkCikl687Teov1Rw7PaGXIYwYzGfVRKw77SytwTIGX85nRMong1ighfcxn/VTVfaZRVObEXiVPu9IlfxQkf6vLPoY/0r7eiXfVfHSRr9qcxbwANdypbBLcEtfR1bZMCprsZAW9mEVd9bY1fsGlMgDOG;3:nNrt+4HS0EGLNbytV2gYYSk6mnAt5YLxOHCP8jZxuMzOcDrc9UV1ZZklkdJUUihpKEa02UeFJgCScxCGn2jAl+bUibnTZFsKxOEQOWV+4kSUPx6Au/hCI3S55fIIJ9OG;25:RstwbkdmeuBxMxhafBENK3b+VZus11cWKZGFQIeeqjY9QtU+MAUMIKAaH6g3FJkxMKKvB3ObqI68PrRFFpw23n3JQzH90v+feQE1OrboHJkHsSlE1Wcz1m1+gs2nwYD/kcQkINrx6ntvz29/yiw6Igw0n36Ue044tyY06FNAvoure+fnXyG7we6fmSqH1fSYnISrRHbc9guys3jP0fnMVEPXtd8DtHtm7v5CpBRdAqnPvIjtlSFNagCIyD/WHlwZFabxTRcgkYT9Nxv1Xtikgugm9XTAQaDrS3pg0ez15g4hqJvANsWMXhsM8OXXFpqVPiVdQrq/ae8E44p9hbIiDtIpF+/9XS0+U6bafBeYV/eorDSoTiC1xlCyYe+R26W02KhzMatMxVb/QQDcQ/XrV0dkvLnN0SmlBP8RygmPH4c= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HE1PR0201MB2314; X-Microsoft-Exchange-Diagnostics: 1;HE1PR0201MB2314;31:hEqsP7/g+fJnKquN/lmPyWs+X/QwaaGWmSX9joKZSGb2m5x6Gh/p5uLIfYrXy4UWh0K/HCfadzk3WiLAgxggAGBNDClVoBnEsj3klKGFzUli6UfQZg2i2guV5KTd5mKopv8UC4RKNZJRUdCW2Hn//Y/BDDx5OCM363ec9oFBRUyUJezKfEEgkP6iazdx+br8ZazSxycKHPjMDdiXOEy9BurTe7yoyPEQ3XKw9arAD6g=;4:bghDa88Hb2d9EF7lKmpDsau9xbGnsZV6AAqVjt5cu20BvuerfMLKWOH0PLpTBTu0FhzTaIF9D7uuYq5VvklZq4wfsyOTwsMOHmZPcsj0mTPiWVEazTrSA30HuUssAm7aZ92SgX2NfUpJefS8VO9n7ZzQRUbubV3fT0FKJp9hgujEiRJpZNaL7LR8Aji2LfLyku4ZtfXesbxP6oaED0KLvJ7sUB+HUegqKBKKDc0NnDWJoEK2ohNqzsF/f96dHgfIo/jNDZe0NpGVhR7r6+OyMBjsidv1US2B69bH2thPlxzaFi8IsJr5Bv+P0DGaBGlNcAPk/SWn140gxqdJSTeBEGm4f+zMlZzNAVUnGRK0tSSM+p3wdstwSg2KyMS19Nq3piUQluIFemeKe10iR77IxutGvYBpTQrhn6Y/nRMe6cg= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040176)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6043046)(6042046);SRVR:HE1PR0201MB2314;BCL:0;PCL:0;RULEID:;SRVR:HE1PR0201MB2314; X-Forefront-PRVS: 006546F32A X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6069001)(6009001)(7916002)(189002)(199003)(5003940100001)(230783001)(36756003)(81156014)(33646002)(50986999)(86362001)(77096005)(8676002)(2906002)(66066001)(586003)(6116002)(50466002)(110136003)(47776003)(50226002)(81166006)(106356001)(229853001)(92566002)(105586002)(3846002)(101416001)(5660300001)(189998001)(42186005)(97736004)(19580405001)(4326007)(305945005)(74482002)(7846002)(19580395003)(48376002)(68736007)(7736002)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:HE1PR0201MB2314;H:localhost.localdomain;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;HE1PR0201MB2314;23:YgtXXp/5GF/OwKg6YfBwd551KQpZ8Nlc65Mmxzy?= =?us-ascii?Q?4I7chqcERhkloKLAZrI03VTQdMuhPxiAr7ZlkiVznb61yYGZArT23qE4rlCq?= =?us-ascii?Q?xCMaH5++kstNHQXSBJYa4TgOs3hTDfJW+nkpZe+DADzA2tsG6Rm5yxmk9W0k?= =?us-ascii?Q?3Tp4kVQQrT3vx43pJQzgV0+cm0atg89W6t4AbbhBglQKKwT+nu050VJv4+Pw?= =?us-ascii?Q?+9TeiIuH5eRJQN8z4QqKO5kAzhy3cv7aMd4fwPWpx8UG/bE27Qek3AO0WVo4?= =?us-ascii?Q?6OIlFXHYW9L+SLuDzHmo+1ZyTyzsC1hwlyOn1b3jdflz/d0pCxEExtPg4JwI?= =?us-ascii?Q?WqM88oH25Wb6p0S5L4sjkzM7QxnjoPAkKoEUM6M7yGjUMTn6D2uNUXnfK/qU?= =?us-ascii?Q?ztQ9w2mYUODVtltZ3LYcOx//MQC8y0hp6NAhj7PyBI1UdiQm7ckW8S8C8Tpu?= =?us-ascii?Q?ZZqMpFggi6w80+Rgn+4xWGFaHTrOdqq25AiGDEAPHHorqgSeCMS7HHFF/AR2?= =?us-ascii?Q?1QmsZkn0XKOjtG7IEUjwRs3ukhp4TnTaT2z2Ao+YgBK41bnFHNgcq6bb2l8C?= =?us-ascii?Q?lZ0Bty/oKiyAMTqICAaYUfbXr86hIixUCfomr9Qb0EVm/3HX9eGWJHNMQ5NU?= =?us-ascii?Q?1kCWrNRD/+MGXGW71ZuczvfOWV47zsNuHJzZ+YZz7pBsP81AAkWpw4FtBjwA?= =?us-ascii?Q?AVvzz0WKzdLAW/sXm7dq0Z23kn3vbZxhwUH3I73iXQoKb/GLRDxmTVYeFmZe?= =?us-ascii?Q?055FE5ezOs37/gtAxoiPS0r2irs6vcOqxH89roS6TU7KH7tZ/1G/HP0cPFQL?= =?us-ascii?Q?1x8RdLYJ+BIF/GAhZGvAx8Jahq04RVYgbtpzey40C65B6KmH1nWn4mXYLD0T?= =?us-ascii?Q?s64kPWUKA1lWj59GyKAny4WNeRVSZtc3EyK8+OmSVe3jlsJdlPzQE4ZmA12Q?= =?us-ascii?Q?iUKXbdBh52o54zOM69LIJWGrRuZoB+h3DA609/+kT9h3LaheH0llRBYDR/CG?= =?us-ascii?Q?qtwqHURW5z4u1Gwi5kUbqiWdfe7Q8to87qRU6mudTln67VG86sCwjoMWqL5n?= =?us-ascii?Q?b/0uF6Mn63V5Vdw1ie0REQITKc7XL?= X-Microsoft-Exchange-Diagnostics: 1;HE1PR0201MB2314;6:dVcAscr4Y4dlDOQJDGliukC+FzbAd/iwcRpfy/ze1iHqcdsIdD8H4/XenGl8kLtjpJgr1fa6Dlz7CbzLSGLKB3cn3ygw4gF2q+aCrWBPp2XlXWONrbb+iNzOAO+vouw/jHHrlKmNB/Vu53OAJa0ic3DRJYid0MTdilYN7NP1upGdne1JumEB/dqqBEC07M8XkVuFMbj0FQJ4z1edHoPuRN2RktZC6b35kge0lPZ/HnJpaopMZMa8E9WJ7vYzsnXA+8ohJQZQP9k9TcO7CabdqchDlBTHBw2/I/YW5dCmrr33caCrzP9LB+kKHj/KbL8/;5:/ady0RpDNeCkxrLAfXwKsBmWkxOzaLBU0gc1HWrgzXvO6NqbUGuD2RKJiAQOfAI3GuyQDpocQpwAaCXNuHd8MNW0QmUd2GBs9EVvGGJrAywmNPoJbskHlrfBGQTV0wYbOOBcFqpNWhc3fMEXmq784Q==;24:RHp1z8+SnOBByMwDEsAPsyrhsMOfJNAo8EGMtE1PkrG5jq+vIjYAiaqQGa3nUFSSzTm55PVhVHmlxyL+EajxjxzB0I/T7lMO7dR6Z5kX6d8=;7:4Nx78b4PrSgdr5I0A8655zCOSh/Df3QvE0TLZi8GMR6jM/BkD/z5FxrCdLswfWzwN8SYiA7BkZ77t97tXxlCxHEPlcp73SnWqnTTBrJxSoVyJl6dkTAGoJakiLMPemzS4GsM0zF1sVsVIbFq8nt9nF5f2nrxzt415OV96C+T9Ye6G61fgF3hf8EQpB/ZdO/wiUJ5jzakblil0i4lO2rRxtx9izqGf574zKRPeJ9Ps3+0Uo1jx0Qww2GgDyOH0oDB SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2016 13:24:24.6048 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0201MB2314 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The cached value of the last selected channel prevents retries on the next call, even on failure to update the selected channel. Fix that. Signed-off-by: Peter Rosin --- drivers/i2c/muxes/i2c-mux-pca954x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c index 528e755c468f..3278ebf1cc5c 100644 --- a/drivers/i2c/muxes/i2c-mux-pca954x.c +++ b/drivers/i2c/muxes/i2c-mux-pca954x.c @@ -164,7 +164,7 @@ static int pca954x_select_chan(struct i2c_mux_core *muxc, u32 chan) /* Only select the channel if its different from the last channel */ if (data->last_chan != regval) { ret = pca954x_reg_write(muxc->parent, client, regval); - data->last_chan = regval; + data->last_chan = ret ? 0 : regval; } return ret; -- 2.1.4