From patchwork Sat Feb 24 22:43:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Jordan X-Patchwork-Id: 877478 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=elektrobit.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zpjwg0RtWz9sWM for ; Sun, 25 Feb 2018 09:50:27 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751463AbeBXWuX (ORCPT ); Sat, 24 Feb 2018 17:50:23 -0500 Received: from agrajag.zerfleddert.de ([88.198.237.222]:33282 "EHLO agrajag.zerfleddert.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751481AbeBXWuU (ORCPT ); Sat, 24 Feb 2018 17:50:20 -0500 Received: by agrajag.zerfleddert.de (Postfix, from userid 1000) id EF85F5B204A2; Sat, 24 Feb 2018 23:43:28 +0100 (CET) Date: Sat, 24 Feb 2018 23:43:28 +0100 From: Tobias Jordan To: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Wolfram Sang Subject: [PATCH] i2c: imx: Fix PM device usage count Message-ID: <20180224224328.2pfki7rqcxqetmlz@agrajag.zerfleddert.de> MIME-Version: 1.0 Content-Disposition: inline User-Agent: NeoMutt/20170113 (1.7.2) Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org pm_runtime_get_sync() increases the device's usage count even when reporting an error, so add a call to pm_runtime_put_noidle() in the related error branches. Fixes: 588eb93ea49f ("i2c: imx: add runtime pm support to improve the performance") Signed-off-by: Tobias Jordan --- In i2c_imx_xfer(), one could also move the "out" label up (in front of the call to pm_runtime_put_autosuspend()), but I'm not sure what the underlying error scenario is; calling _put_noidle() seems to be the safer bet. This is one of a number of patches for problems found using coccinelle scripting in the SIL2LinuxMP project. The patch has been compile-tested; it's based on linux-next-20180223. For a discussion of the corresponding issue, see https://marc.info/?l=linux-pm&m=151904483924999&w=2 drivers/i2c/busses/i2c-imx.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 999557729ad2..dae3c923d42c 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -890,8 +890,10 @@ static int i2c_imx_xfer(struct i2c_adapter *adapter, dev_dbg(&i2c_imx->adapter.dev, "<%s>\n", __func__); result = pm_runtime_get_sync(i2c_imx->adapter.dev.parent); - if (result < 0) + if (result < 0) { + pm_runtime_put_noidle(i2c_imx->adapter.dev.parent); goto out; + } /* Start I2C transfer */ result = i2c_imx_start(i2c_imx); @@ -1179,8 +1181,10 @@ static int i2c_imx_remove(struct platform_device *pdev) int ret; ret = pm_runtime_get_sync(&pdev->dev); - if (ret < 0) + if (ret < 0) { + pm_runtime_put_noidle(&pdev->dev); return ret; + } /* remove adapter */ dev_dbg(&i2c_imx->adapter.dev, "adapter removed\n");