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

Commit 83f56f7c authored by Markus Elfring's avatar Markus Elfring Committed by Mauro Carvalho Chehab
Browse files

[media] USB: Deletion of unnecessary checks before three function calls 



GIT_AUTHOR_DATE=1416486805
The functions pvr2_hdw_destroy(), rc_unregister_device() and vfree() perform
also input parameter validation. Thus the test around the call is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 332b295d

drivers/media/usb/au0828/au0828-input.c

+1 −2
Original line number Diff line number Diff line
@@ -363,7 +363,6 @@ void au0828_rc_unregister(struct au0828_dev *dev) 
	if (!ir)

		return;



	if (ir->rc)

	rc_unregister_device(ir->rc);



	/* done */

drivers/media/usb/em28xx/em28xx-input.c

+1 −2
Original line number Diff line number Diff line
@@ -841,7 +841,6 @@ static int em28xx_ir_fini(struct em28xx *dev) 
	if (!ir)

		goto ref_put;



	if (ir->rc)

	rc_unregister_device(ir->rc);



	kfree(ir->i2c_client);

drivers/media/usb/pvrusb2/pvrusb2-context.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static void pvr2_context_set_notify(struct pvr2_context *mp, int fl) 
static void pvr2_context_destroy(struct pvr2_context *mp)

{

	pvr2_trace(PVR2_TRACE_CTXT,"pvr2_context %p (destroy)",mp);

	if (mp->hdw) pvr2_hdw_destroy(mp->hdw);

	pvr2_hdw_destroy(mp->hdw);

	pvr2_context_set_notify(mp, 0);

	mutex_lock(&pvr2_context_mutex);

	if (mp->exist_next) {

drivers/media/usb/s2255/s2255drv.c

+1 −2
Original line number Diff line number Diff line
@@ -1974,7 +1974,6 @@ static int s2255_release_sys_buffers(struct s2255_vc *vc) 
{

	unsigned long i;

	for (i = 0; i < SYS_FRAMES; i++) {

		if (vc->buffer.frame[i].lpvbits)

		vfree(vc->buffer.frame[i].lpvbits);

		vc->buffer.frame[i].lpvbits = NULL;

	}