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,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 09107C2D0CE for ; Sun, 29 Dec 2019 18:15:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CAFE820748 for ; Sun, 29 Dec 2019 18:15:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577643333; bh=lDU8UXd44CAG/20/oHfhgQ3JDQoCzJp8m60+aibTo58=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hnEKw/StIxf4AEHC+Smnbhh6s3xdexXbtRbL8Vx1bFIE2wMMbxQlTBErG08qg1cQ/ TeMboHouGOe34+kED+/O1EFAs4SNdL7WYXrOX33EIc/PT/pgjPE82AaPSpsN6Aguzh pLhu4KwbMoxz4lHUf32DgZThg7YgS5hSAJXkhC3M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727965AbfL2RZ0 (ORCPT ); Sun, 29 Dec 2019 12:25:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:45234 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727960AbfL2RZZ (ORCPT ); Sun, 29 Dec 2019 12:25:25 -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 BA16C21744; Sun, 29 Dec 2019 17:25:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577640325; bh=lDU8UXd44CAG/20/oHfhgQ3JDQoCzJp8m60+aibTo58=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m78v3ibBCVVYku7bQhjsTyLKnDL6MGXYcQsRY238LREk/9l20gWJUNEqjMNpWXDXt PQRxNcxX3hRKy+S3S5sciT0rhhVeaB7f8NAtCKTMjOmeDr9LvmEe58rhpSH7wNx80Z BEI4B4Plp7D42SpxIcda1FjtHxwUIBKph+1EFb6E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chuhong Yuan , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.14 110/161] media: si470x-i2c: add missed operations in remove Date: Sun, 29 Dec 2019 18:19:18 +0100 Message-Id: <20191229162430.180371943@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229162355.500086350@linuxfoundation.org> References: <20191229162355.500086350@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: Chuhong Yuan [ Upstream commit 2df200ab234a86836a8879a05a8007d6b884eb14 ] The driver misses calling v4l2_ctrl_handler_free and v4l2_device_unregister in remove like what is done in probe failure. Add the calls to fix it. Signed-off-by: Chuhong Yuan Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/radio/si470x/radio-si470x-i2c.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/media/radio/si470x/radio-si470x-i2c.c b/drivers/media/radio/si470x/radio-si470x-i2c.c index 8ce6f9cff746..b60fb6ed5aeb 100644 --- a/drivers/media/radio/si470x/radio-si470x-i2c.c +++ b/drivers/media/radio/si470x/radio-si470x-i2c.c @@ -455,6 +455,8 @@ static int si470x_i2c_remove(struct i2c_client *client) video_unregister_device(&radio->videodev); kfree(radio); + v4l2_ctrl_handler_free(&radio->hdl); + v4l2_device_unregister(&radio->v4l2_dev); return 0; } -- 2.20.1