From patchwork Tue Sep 29 10:58:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 290761 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9619CC4727F for ; Tue, 29 Sep 2020 12:40:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 46D722083B for ; Tue, 29 Sep 2020 12:40:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601383246; bh=xLEf58mjGmbH0CWWabSTZzpE4t32riFaLBMWYf6Q/rg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EEbcyeQ106tsKlcfU3mK4GR+HK3YUPcPVeQ/8WzRprMfWl73WXfZyZJt7b6p11WnU o1tFt3kmFqYETSvi1JfYaS3FA5HHlDc2z57b7baRQlYvXZNdfUgm5ccf4i6HCrYTSx FPewQVFyhN4kN+TJTOk71IubEokj+nzVRIOPFulI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729018AbgI2LOi (ORCPT ); Tue, 29 Sep 2020 07:14:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:57432 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728480AbgI2LO3 (ORCPT ); Tue, 29 Sep 2020 07:14:29 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6EBD220848; Tue, 29 Sep 2020 11:14:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601378068; bh=xLEf58mjGmbH0CWWabSTZzpE4t32riFaLBMWYf6Q/rg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PqIuPjRrPij/5RPAFtFyyCqIcXSVP1C6ziGADElMAGY5HuNuT8YlD56wewJ+sVrmU lcjpOauwH1R++pwB/Z4VWGdYFKc9kAwCHuE+EGmEY/lRchMrSyoEcRa1tpvnYIWcvJ c63qSwUpkvuX1McZYSJwmNJ2/TNS3bY62t076VUI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sakari Ailus , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.14 023/166] media: smiapp: Fix error handling at NVM reading Date: Tue, 29 Sep 2020 12:58:55 +0200 Message-Id: <20200929105936.351959864@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929105935.184737111@linuxfoundation.org> References: <20200929105935.184737111@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sakari Ailus [ Upstream commit a5b1d5413534607b05fb34470ff62bf395f5c8d0 ] If NVM reading failed, the device was left powered on. Fix that. Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/i2c/smiapp/smiapp-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c index e4d7f2febf00c..05b3974bd9202 100644 --- a/drivers/media/i2c/smiapp/smiapp-core.c +++ b/drivers/media/i2c/smiapp/smiapp-core.c @@ -2338,11 +2338,12 @@ smiapp_sysfs_nvm_read(struct device *dev, struct device_attribute *attr, if (rval < 0) { if (rval != -EBUSY && rval != -EAGAIN) pm_runtime_set_active(&client->dev); - pm_runtime_put(&client->dev); + pm_runtime_put_noidle(&client->dev); return -ENODEV; } if (smiapp_read_nvm(sensor, sensor->nvm)) { + pm_runtime_put(&client->dev); dev_err(&client->dev, "nvm read failed\n"); return -ENODEV; }