From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:47226 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755076AbbG3AZq (ORCPT ); Wed, 29 Jul 2015 20:25:46 -0400 Subject: Patch "i2c: mux: Use __i2c_transfer() instead of calling parent's master_xfer()" has been added to the 4.1-stable tree To: alexander.sverdlin@nokia.com, gregkh@linuxfoundation.org, lukasz.gemborowski@nokia.com, wsa@the-dreams.de Cc: , From: Date: Wed, 29 Jul 2015 17:25:45 -0700 Message-ID: <1438215945252252@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled i2c: mux: Use __i2c_transfer() instead of calling parent's master_xfer() to the 4.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: i2c-mux-use-__i2c_transfer-instead-of-calling-parent-s-master_xfer.patch and it can be found in the queue-4.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From e766f338a74200b8104b1165776b19f56e252834 Mon Sep 17 00:00:00 2001 From: Alexander Sverdlin Date: Fri, 12 Jun 2015 14:40:37 +0200 Subject: i2c: mux: Use __i2c_transfer() instead of calling parent's master_xfer() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Alexander Sverdlin commit e766f338a74200b8104b1165776b19f56e252834 upstream. Newly introduced quirks infrastructure doesn't work for the devices behind MUXes because MUX's master_xfer() calls parent's master_xfer() directly without checking the quirks. Instead of duplicating check code in MUX just call __i2c_transfer() instead. This has a side effect on tracing (messages will appear on both MUX bus and parent bus), but maybe that's not bad at the end. Signed-off-by: Alexander Sverdlin Tested-by: Łukasz Gemborowski Signed-off-by: Wolfram Sang Fixes: b7f625840267b1 ("i2c: add quirk checks to core") Signed-off-by: Greg Kroah-Hartman --- drivers/i2c/i2c-mux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/i2c/i2c-mux.c +++ b/drivers/i2c/i2c-mux.c @@ -51,7 +51,7 @@ static int i2c_mux_master_xfer(struct i2 ret = priv->select(parent, priv->mux_priv, priv->chan_id); if (ret >= 0) - ret = parent->algo->master_xfer(parent, msgs, num); + ret = __i2c_transfer(parent, msgs, num); if (priv->deselect) priv->deselect(parent, priv->mux_priv, priv->chan_id); Patches currently in stable-queue which might be from alexander.sverdlin@nokia.com are queue-4.1/i2c-mux-pca954x-use-__i2c_transfer-because-of-quirks.patch queue-4.1/i2c-mux-use-__i2c_transfer-instead-of-calling-parent-s-master_xfer.patch queue-4.1/i2c-use-parent-adapter-quirks-in-mux.patch