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 354D7C00454 for ; Tue, 10 Dec 2019 21:35:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F0A47208C3 for ; Tue, 10 Dec 2019 21:35:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576013721; bh=6JxhDt8AD+eRY+rKjRRJvHmhwiyRuiChLp0XkVwf1bs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hZml3h6B9cxyuGsIrmMXZKOqG3D2CLzi90ZAOgQvcc3RQ/KX8hSW4wdcMYPGvkn+4 2+035mhl6CizmdrS7cfOUpGfNZWafjjcFT0hm/t3kDoNtyL2j4kTc8jvYDMHvPV/yP CHId6yNIC6kdygg+OrZvXYdCxlODmD54jEMedPuI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730232AbfLJVfU (ORCPT ); Tue, 10 Dec 2019 16:35:20 -0500 Received: from mail.kernel.org ([198.145.29.99]:40600 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727296AbfLJVfF (ORCPT ); Tue, 10 Dec 2019 16:35:05 -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 CA8E42465C; Tue, 10 Dec 2019 21:35:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576013704; bh=6JxhDt8AD+eRY+rKjRRJvHmhwiyRuiChLp0XkVwf1bs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J2Ao6o/jDzT6NJ8UtPtLWmqKWNrEnKU1TDJ8pFzYugvM5uYR/BLNE3ju7BveXdtQL N81Mfvs79l+YSuU0EfquxDfV48343ekv8n43Z1XK2zQsZGTY4AaDxIQ+C1V4aewCxn 4SweHyH4l6badAiZbNGQ8/sG1mhET2o6dzgqmtzE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chuhong Yuan , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 133/177] media: si470x-i2c: add missed operations in remove Date: Tue, 10 Dec 2019 16:31:37 -0500 Message-Id: <20191210213221.11921-133-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191210213221.11921-1-sashal@kernel.org> References: <20191210213221.11921-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: 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 e3b3ecd14a4dd..ae7540b765e1d 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