From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 63601C43331 for ; Wed, 13 Nov 2019 02:11:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3175B222C9 for ; Wed, 13 Nov 2019 02:11:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573611095; bh=fPTTL918haYPzKywCNCsAU+vg6L7/gNh4/5v3ts11vI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JEzgNGmPrGTfxazAFxxOEu6onNcKeySsyKoh93Hbkt0CO8jUtPVvWfnwWBSYm9XLC jAcEDGNqwzH7TlxfDMES3efcH5np8ic6dZYHx+/6Dv5bscvdV2XEeE+9+EJ+JTAiAQ PeACnpjrivEl1R+B/9exvNwJrvS0+GI0s/bDo9NM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730578AbfKMCLe (ORCPT ); Tue, 12 Nov 2019 21:11:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:52724 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730099AbfKMB6p (ORCPT ); Tue, 12 Nov 2019 20:58:45 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 49AAF2245A; Wed, 13 Nov 2019 01:58:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573610325; bh=fPTTL918haYPzKywCNCsAU+vg6L7/gNh4/5v3ts11vI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1i3eadg7TxvrIskxUaOzfViwkjGytc20FBVD4GDyVH2DgM9EvyLToGgY8VVFYl40d IpbaW4FKKlMOh2DSpNMLmHaHxqbPCw4iKhms+3sKGLRSGBSr9pQjO/yzlZKAOiUFEc /yGb+r5GwuxXc/4mMJCW7ZB2HFZxlqxdc1sJ8k+E= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Rajmohan Mani , Sakari Ailus , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 086/115] media: dw9714: Fix error handling in probe function Date: Tue, 12 Nov 2019 20:55:53 -0500 Message-Id: <20191113015622.11592-86-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191113015622.11592-1-sashal@kernel.org> References: <20191113015622.11592-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rajmohan Mani [ Upstream commit f9a0b14240a2d0bd196d35e8aac73df6eabd6382 ] Fixed the case where v4l2_async_unregister_subdev() is called unnecessarily in the error handling path in probe function. Signed-off-by: Rajmohan Mani Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/i2c/dw9714.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/i2c/dw9714.c b/drivers/media/i2c/dw9714.c index 95af4fc99cd04..c1273bcd59011 100644 --- a/drivers/media/i2c/dw9714.c +++ b/drivers/media/i2c/dw9714.c @@ -182,7 +182,8 @@ static int dw9714_probe(struct i2c_client *client) return 0; err_cleanup: - dw9714_subdev_cleanup(dw9714_dev); + v4l2_ctrl_handler_free(&dw9714_dev->ctrls_vcm); + media_entity_cleanup(&dw9714_dev->sd.entity); dev_err(&client->dev, "Probe failed: %d\n", rval); return rval; } -- 2.20.1