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=-9.8 required=3.0 tests=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=ham 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 1A737C432C0 for ; Fri, 22 Nov 2019 11:03:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E48E82075E for ; Fri, 22 Nov 2019 11:03:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574420598; bh=sYQwy0mr+/sqRpZnuVp/y88pnLT1G0lmL9bwKXQivFY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CjuD6T5hcFfJJIAK8u1Q1vWmhMNWVxSCRYLm9Jgz0KV7oNZ9KtkjHYWbHaymZ9rRD T/D0l/RuovxFCQ1d6E7/+hvwpjl37bLFsay1FsdweAuDOowXtPmvGZr2oJtmV4v5GU P8e8cvc+taOi7QZVLac/R0Te5P3umx30/BnndCDo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729923AbfKVLDQ (ORCPT ); Fri, 22 Nov 2019 06:03:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:57298 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728731AbfKVLDO (ORCPT ); Fri, 22 Nov 2019 06:03:14 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 39C882073F; Fri, 22 Nov 2019 11:03:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574420593; bh=sYQwy0mr+/sqRpZnuVp/y88pnLT1G0lmL9bwKXQivFY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mZp5DSDUhZ7jOV2XH4GJI4jb/VTvnLSWEcAUroi7El6m6hCOHU2pfOKWq7wRjT7RE /LP+vfhY1wz0Nn9N+zsHyM5pNEwlFXsb9kDSdvsVh96+og8Oh/Huh/SRHx4+Kx7RL2 mAVB7Bq/aq6uWFzP7mAYRv3G8of6gM6CSYtwFk1w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rajmohan Mani , Sakari Ailus , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.19 159/220] media: dw9714: Fix error handling in probe function Date: Fri, 22 Nov 2019 11:28:44 +0100 Message-Id: <20191122100924.155041370@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100912.732983531@linuxfoundation.org> References: <20191122100912.732983531@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 91fae01d052bf..3dc2100470a1c 100644 --- a/drivers/media/i2c/dw9714.c +++ b/drivers/media/i2c/dw9714.c @@ -169,7 +169,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