diff options
author | Mariusz Kozlowski <m.kozlowski@tuxland.pl> | 2007-01-07 08:33:39 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-21 10:34:17 -0500 |
commit | 22071a42a1b44ae90d232f4bd5d6d3f80ad4eaa2 (patch) | |
tree | 831927cc4151150f4b8a847400055a6334d37ac9 | |
parent | 16e9495d8bd5ec8ef3c1a32cd720542b1cc2b298 (diff) |
V4L/DVB (5026): Pvrusb2-hdw kfree cleanup
Removes redundant argument check for kfree().
Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-hdw.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c index c37f8e18b70b..503255cebc2e 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c | |||
@@ -1926,10 +1926,10 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf, | |||
1926 | if (hdw) { | 1926 | if (hdw) { |
1927 | usb_free_urb(hdw->ctl_read_urb); | 1927 | usb_free_urb(hdw->ctl_read_urb); |
1928 | usb_free_urb(hdw->ctl_write_urb); | 1928 | usb_free_urb(hdw->ctl_write_urb); |
1929 | if (hdw->ctl_read_buffer) kfree(hdw->ctl_read_buffer); | 1929 | kfree(hdw->ctl_read_buffer); |
1930 | if (hdw->ctl_write_buffer) kfree(hdw->ctl_write_buffer); | 1930 | kfree(hdw->ctl_write_buffer); |
1931 | if (hdw->controls) kfree(hdw->controls); | 1931 | kfree(hdw->controls); |
1932 | if (hdw->mpeg_ctrl_info) kfree(hdw->mpeg_ctrl_info); | 1932 | kfree(hdw->mpeg_ctrl_info); |
1933 | kfree(hdw); | 1933 | kfree(hdw); |
1934 | } | 1934 | } |
1935 | return NULL; | 1935 | return NULL; |
@@ -1994,10 +1994,10 @@ void pvr2_hdw_destroy(struct pvr2_hdw *hdw) | |||
1994 | unit_pointers[hdw->unit_number] = NULL; | 1994 | unit_pointers[hdw->unit_number] = NULL; |
1995 | } | 1995 | } |
1996 | } while (0); up(&pvr2_unit_sem); | 1996 | } while (0); up(&pvr2_unit_sem); |
1997 | if (hdw->controls) kfree(hdw->controls); | 1997 | kfree(hdw->controls); |
1998 | if (hdw->mpeg_ctrl_info) kfree(hdw->mpeg_ctrl_info); | 1998 | kfree(hdw->mpeg_ctrl_info); |
1999 | if (hdw->std_defs) kfree(hdw->std_defs); | 1999 | kfree(hdw->std_defs); |
2000 | if (hdw->std_enum_names) kfree(hdw->std_enum_names); | 2000 | kfree(hdw->std_enum_names); |
2001 | kfree(hdw); | 2001 | kfree(hdw); |
2002 | } | 2002 | } |
2003 | 2003 | ||