lkml.org 
[lkml]   [2021]   [Jun]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2/3] media: dvb-usb: move kfree(d) to dvb_usb_device_exit
Date
As d is allocated in dvb_usb_device_init, so move to the deallocation of
d from dvb_usb_exit to dvb_usb_device_exit

Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com>
---
drivers/media/usb/dvb-usb/dvb-usb-init.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/usb/dvb-usb/dvb-usb-init.c b/drivers/media/usb/dvb-usb/dvb-usb-init.c
index edc477cedaa9..21ad51be4820 100644
--- a/drivers/media/usb/dvb-usb/dvb-usb-init.c
+++ b/drivers/media/usb/dvb-usb/dvb-usb-init.c
@@ -147,7 +147,6 @@ static int dvb_usb_exit(struct dvb_usb_device *d)
d->props.priv_destroy(d);

kfree(d->priv);
- kfree(d);
return 0;
}

@@ -333,9 +332,10 @@ void dvb_usb_device_exit(struct usb_interface *intf)
char name[40];

usb_set_intfdata(intf, NULL);
- if (d != NULL && d->desc != NULL) {
+ if (d && d->desc) {
strscpy(name, d->desc->name, sizeof(name));
dvb_usb_exit(d);
+ kfree(d);
} else {
strscpy(name, default_name, sizeof(name));
}
--
2.25.1
\
 
 \ /
  Last update: 2021-06-21 07:09    [W:0.077 / U:0.768 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site