Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757062AbbEVJcU (ORCPT ); Fri, 22 May 2015 05:32:20 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:34962 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757059AbbEVI7S (ORCPT ); Fri, 22 May 2015 04:59:18 -0400 From: Luis Henriques To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Charles Keepax , Beata Michalska , Wolfram Sang , Ben Hutchings , Luis Henriques Subject: [PATCH 3.16.y-ckt 038/129] Revert "i2c: Mark adapter devices with pm_runtime_no_callbacks" Date: Fri, 22 May 2015 09:57:03 +0100 Message-Id: <1432285114-9254-39-git-send-email-luis.henriques@canonical.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1432285114-9254-1-git-send-email-luis.henriques@canonical.com> References: <1432285114-9254-1-git-send-email-luis.henriques@canonical.com> X-Extended-Stable: 3.16 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1433 Lines: 39 3.16.7-ckt12 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Luis Henriques This reverts commit aba636b877ec270075cbb01b4fceb460f0c3f07a which is commit 6ada5c1e1b077ab98fc144d7ac132b4dcc0148ec upstream. This is being reverted because it fixes a regression that was introduced in 4.0 and does not affect 3.16 kernel. Cc: Charles Keepax Cc: Beata Michalska Cc: Wolfram Sang Cc: Ben Hutchings Signed-off-by: Luis Henriques --- drivers/i2c/i2c-core.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 4d835fbeba44..d66af95d3de4 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -1252,8 +1252,6 @@ static int i2c_register_adapter(struct i2c_adapter *adap) dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name); - pm_runtime_no_callbacks(&adap->dev); - #ifdef CONFIG_I2C_COMPAT res = class_compat_create_link(i2c_adapter_compat_class, &adap->dev, adap->dev.parent); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/