Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b737f3b8 authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman
Browse files

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: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6911e7e4

drivers/staging/easycap/easycap_main.c

+3 −8
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ int rc; 
JOT(4, "\n");

SAY("==========OPEN=========\n");



peasycap = NULL;

/*---------------------------------------------------------------------------*/

#ifndef EASYCAP_IS_VIDEODEV_CLIENT

if (NULL == inode) {
@@ -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