lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (5026): Pvrusb2-hdw kfree cleanup

Browse Source 
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>
This commit is contained in:
Mariusz Kozlowski
2007-01-07 10:33:39 -03:00
committed by Mauro Carvalho Chehab
parent 16e9495d8b
commit 22071a42a1
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/media/video/pvrusb2/pvrusb2-hdw.c
View File

@@ -1926,10 +1926,10 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
if (hdw) { if (hdw) {
usb_free_urb(hdw->ctl_read_urb); usb_free_urb(hdw->ctl_read_urb);
usb_free_urb(hdw->ctl_write_urb); usb_free_urb(hdw->ctl_write_urb);
if (hdw->ctl_read_buffer) kfree(hdw->ctl_read_buffer); kfree(hdw->ctl_read_buffer);
if (hdw->ctl_write_buffer) kfree(hdw->ctl_write_buffer); kfree(hdw->ctl_write_buffer);
if (hdw->controls) kfree(hdw->controls); kfree(hdw->controls);
if (hdw->mpeg_ctrl_info) kfree(hdw->mpeg_ctrl_info); kfree(hdw->mpeg_ctrl_info);
kfree(hdw); kfree(hdw);
} }
return NULL; return NULL;
@@ -1994,10 +1994,10 @@ void pvr2_hdw_destroy(struct pvr2_hdw *hdw)
unit_pointers[hdw->unit_number] = NULL; unit_pointers[hdw->unit_number] = NULL;
} }
} while (0); up(&pvr2_unit_sem); } while (0); up(&pvr2_unit_sem);
if (hdw->controls) kfree(hdw->controls); kfree(hdw->controls);
if (hdw->mpeg_ctrl_info) kfree(hdw->mpeg_ctrl_info); kfree(hdw->mpeg_ctrl_info);
if (hdw->std_defs) kfree(hdw->std_defs); kfree(hdw->std_defs);
if (hdw->std_enum_names) kfree(hdw->std_enum_names); kfree(hdw->std_enum_names);
kfree(hdw); kfree(hdw);
} }