Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756286AbcCUNaY (ORCPT ); Mon, 21 Mar 2016 09:30:24 -0400 Received: from swift.blarg.de ([78.47.110.205]:48047 "EHLO swift.blarg.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756154AbcCUNaT (ORCPT ); Mon, 21 Mar 2016 09:30:19 -0400 Subject: [PATCH 1/6] drivers/media/dvb-core/en50221: move code to dvb_ca_private_free() From: Max Kellermann To: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Date: Mon, 21 Mar 2016 14:30:17 +0100 Message-ID: <145856701730.21117.7759662061999658129.stgit@woodpecker.blarg.de> User-Agent: StGit/0.17.1-16-g3c77 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1393 Lines: 42 Prepare for postponing the call until all file handles have been closed. Signed-off-by: Max Kellermann --- drivers/media/dvb-core/dvb_ca_en50221.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/media/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb-core/dvb_ca_en50221.c index f82cd1f..e33364c 100644 --- a/drivers/media/dvb-core/dvb_ca_en50221.c +++ b/drivers/media/dvb-core/dvb_ca_en50221.c @@ -161,6 +161,17 @@ struct dvb_ca_private { struct mutex ioctl_mutex; }; +static void dvb_ca_private_free(struct dvb_ca_private *ca) +{ + dvb_unregister_device(ca->dvbdev); + unsigned int i; + for (i = 0; i < ca->slot_count; i++) { + vfree(ca->slot_info[i].rx_buffer.data); + } + kfree(ca->slot_info); + kfree(ca); +} + static void dvb_ca_en50221_thread_wakeup(struct dvb_ca_private *ca); static int dvb_ca_en50221_read_data(struct dvb_ca_private *ca, int slot, u8 * ebuf, int ecount); static int dvb_ca_en50221_write_data(struct dvb_ca_private *ca, int slot, u8 * ebuf, int ecount); @@ -1759,10 +1770,7 @@ void dvb_ca_en50221_release(struct dvb_ca_en50221 *pubca) for (i = 0; i < ca->slot_count; i++) { dvb_ca_en50221_slot_shutdown(ca, i); - vfree(ca->slot_info[i].rx_buffer.data); } - kfree(ca->slot_info); - dvb_unregister_device(ca->dvbdev); - kfree(ca); + dvb_ca_private_free(ca); pubca->private = NULL; }