From: Tobias Lorenz <tobias.lorenz@gmx.net>
Date: Tue, 29 Jan 2008 01:43:13 +0000 (-0300)
Subject: V4L/DVB (7108): radio-si470x.c: check-after-use
X-Git-Tag: v2.6.25-rc3~132^2~33
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c3f686f152767b84893e474acd1a7758988dc369;p=linux-2.6-omap-h63xx.git

V4L/DVB (7108): radio-si470x.c: check-after-use

Adrian used the coverity checker against radio-si470x and found this:

> The Coverity checker spotted the following check-after-use in
> drivers/media/radio/radio-si470x.c:
>
> <--  snip  -->
> static void si470x_usb_driver_disconnect(struct usb_interface *intf)
> {
>         struct si470x_device *radio = usb_get_intfdata(intf);
>
>         del_timer_sync(&radio->timer);    <------------------
>         flush_scheduled_work();
>
>         usb_set_intfdata(intf, NULL);
>         if (radio) {                      <------------------
>                 video_unregister_device(radio->videodev);
>                 kfree(radio->buffer);
>                 kfree(radio);
>         }
> }
> <--  snip  -->
>
> Either "radio" can be NULL and this case has to be properly handled or
> the NULL check is not required.

These two lines should indeed better be inside the if statement.

Signed-off-by: Tobias Lorenz <tobias.lorenz@gmx.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/radio/radio-si470x.c b/drivers/media/radio/radio-si470x.c
index a2975c8b009..7fdee3cc6e0 100644
--- a/drivers/media/radio/radio-si470x.c
+++ b/drivers/media/radio/radio-si470x.c
@@ -1439,11 +1439,10 @@ static void si470x_usb_driver_disconnect(struct usb_interface *intf)
 {
 	struct si470x_device *radio = usb_get_intfdata(intf);
 
-	del_timer_sync(&radio->timer);
-	flush_scheduled_work();
-
 	usb_set_intfdata(intf, NULL);
 	if (radio) {
+	       del_timer_sync(&radio->timer);
+	       flush_scheduled_work();
 		video_unregister_device(radio->videodev);
 		kfree(radio->buffer);
 		kfree(radio);