Skip to content

Commit

Permalink
staging/easycap: remove explicit NULL initialization
Browse files Browse the repository at this point in the history
remove intializations to NULL where not needed and let the compiler
find flows with unitilized variables.
Fix one such flow in easycap_vma_fault function

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Tomas Winkler authored and Greg Kroah-Hartman committed Feb 4, 2011
1 parent 6911e7e commit b737f3b
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions drivers/staging/easycap/easycap_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ int rc;
JOT(4, "\n");
SAY("==========OPEN=========\n");

peasycap = NULL;
/*---------------------------------------------------------------------------*/
#ifndef EASYCAP_IS_VIDEODEV_CLIENT
if (NULL == inode) {
Expand Down Expand Up @@ -851,7 +850,7 @@ if (NULL != peasycap->purb_video_head) {
list_for_each_safe(plist_head, plist_next, peasycap->purb_video_head) {
pdata_urb = list_entry(plist_head, struct data_urb, list_head);
if (NULL != pdata_urb) {
kfree(pdata_urb); pdata_urb = NULL;
kfree(pdata_urb); pdata_urb = NULL;
peasycap->allocation_video_struct -=
sizeof(struct data_urb);
m++;
Expand Down Expand Up @@ -2649,8 +2648,6 @@ struct page *page;
struct easycap *peasycap;

retcode = VM_FAULT_NOPAGE;
pbuf = NULL;
page = NULL;

if (NULL == pvma) {
SAY("pvma is NULL\n");
Expand Down Expand Up @@ -2686,16 +2683,15 @@ if (NULL == peasycap) {
pbuf = peasycap->frame_buffer[k][m].pgo;
if (NULL == pbuf) {
SAM("ERROR: pbuf is NULL\n");
goto finish;
return retcode;
}
page = virt_to_page(pbuf);
if (NULL == page) {
SAM("ERROR: page is NULL\n");
goto finish;
return retcode;
}
get_page(page);
/*---------------------------------------------------------------------------*/
finish:
if (NULL == page) {
SAM("ERROR: page is NULL after get_page(page)\n");
} else {
Expand Down Expand Up @@ -3192,7 +3188,6 @@ if (NULL == pusb_interface) {
SAY("ERROR: pusb_interface is NULL\n");
return -EFAULT;
}
peasycap = NULL;
/*---------------------------------------------------------------------------*/
/*
* GET POINTER TO STRUCTURE usb_device
Expand Down

0 comments on commit b737f3b

Please sign in to comment.