diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2011-02-03 13:42:43 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-04 12:44:32 -0800 |
| commit | b737f3b8cf2425f8e5f23ea31bbb4d377c41be7f (patch) | |
| tree | 74dccc9b56c3af0394ddb6168318b3f73ae96a1b /drivers/staging/easycap | |
| parent | 6911e7e4a6bed8ac7989137387f6a33ef65c2b56 (diff) | |
| download | linux-stable-b737f3b8cf2425f8e5f23ea31bbb4d377c41be7f.tar.gz linux-stable-b737f3b8cf2425f8e5f23ea31bbb4d377c41be7f.tar.bz2 linux-stable-b737f3b8cf2425f8e5f23ea31bbb4d377c41be7f.zip | |
staging/easycap: remove explicit NULL initialization
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>
Diffstat (limited to 'drivers/staging/easycap')
| -rw-r--r-- | drivers/staging/easycap/easycap_main.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/staging/easycap/easycap_main.c b/drivers/staging/easycap/easycap_main.c index 21d155a9e28e..8430e0045494 100644 --- a/drivers/staging/easycap/easycap_main.c +++ b/drivers/staging/easycap/easycap_main.c @@ -144,7 +144,6 @@ int rc; JOT(4, "\n"); SAY("==========OPEN=========\n"); -peasycap = NULL; /*---------------------------------------------------------------------------*/ #ifndef EASYCAP_IS_VIDEODEV_CLIENT if (NULL == inode) { @@ -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++; @@ -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"); @@ -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 { @@ -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 |