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 15365C2D0DA for ; Sun, 29 Dec 2019 17:39:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D852621744 for ; Sun, 29 Dec 2019 17:39:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577641151; bh=5jYaJMfka1FMRPXZXlJfUK6Jj/YfPCLDM93i80MT2/g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=rQjtBfFKcCT+e3dI9v2p0Map6zE4DjBQFInJb3K3W4cxGn8Yww1LQ08STmvnp5hrI FQ1DkxUYqvUe9/nYr1emn3CznZFuotP11L+HhDJVcOIch2CJ6/rdzoyLc21RPvcrIf GE0eBEvrD5ujUL2XQEIKB9R/s1Kq4zfmGpVz/Bf0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729456AbfL2Rdc (ORCPT ); Sun, 29 Dec 2019 12:33:32 -0500 Received: from mail.kernel.org ([198.145.29.99]:35396 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729215AbfL2Rdb (ORCPT ); Sun, 29 Dec 2019 12:33:31 -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 3743C20722; Sun, 29 Dec 2019 17:33:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577640810; bh=5jYaJMfka1FMRPXZXlJfUK6Jj/YfPCLDM93i80MT2/g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H6C2fT6jij41FhtrNLzMKbak6bpbJwaGmEnlUCYVEcWdUXuS8nJpFIam2v0//Ro60 V8y5SKepnewUQlOahdQm172J9ZiQEvWpDg9R3EpuaTUkibRLFmaqq+ftZqvxOV7KrR B3587sHV+wgkqUmmirkuYtt6/xO/t7i8lDQ5qmHQ= 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.19 148/219] media: si470x-i2c: add missed operations in remove Date: Sun, 29 Dec 2019 18:19:10 +0100 Message-Id: <20191229162530.827338408@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229162508.458551679@linuxfoundation.org> References: <20191229162508.458551679@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 e3b3ecd14a4d..ae7540b765e1 100644 --- a/drivers/media/radio/si470x/radio-si470x-i2c.c +++ b/drivers/media/radio/si470x/radio-si470x-i2c.c @@ -485,6 +485,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