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

Commit 3328d975 authored by Adrian Bunk's avatar Adrian Bunk Committed by Greg Kroah-Hartman
Browse files

USB rio500.c: fix check-after-use 



The Coverity checker spotted that we have already oops'ed if "dev"
was NULL in these places.

Since "dev" being NULL isn't possible at these places this patch removes
the NULL checks.

Additionally, I've fixed the formatting of the if's.

Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Acked-by: default avatarOliver Neukum <oliver@neukum.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e28c6a77

drivers/usb/misc/rio500.c

+3 −12
Original line number Diff line number Diff line
@@ -118,10 +118,7 @@ ioctl_rio(struct inode *inode, struct file *file, unsigned int cmd, 


	mutex_lock(&(rio->lock));

        /* Sanity check to make sure rio is connected, powered, etc */

        if ( rio == NULL ||

             rio->present == 0 ||

             rio->rio_dev == NULL )

	{

        if (rio->present == 0 || rio->rio_dev == NULL) {

		retval = -ENODEV;

		goto err_out;

	}
@@ -280,10 +277,7 @@ write_rio(struct file *file, const char __user *buffer, 
	if (intr)

		return -EINTR;

        /* Sanity check to make sure rio is connected, powered, etc */

        if ( rio == NULL ||

             rio->present == 0 ||

             rio->rio_dev == NULL )

	{

        if (rio->present == 0 || rio->rio_dev == NULL) {

		mutex_unlock(&(rio->lock));

		return -ENODEV;

	}
@@ -369,10 +363,7 @@ read_rio(struct file *file, char __user *buffer, size_t count, loff_t * ppos) 
	if (intr)

		return -EINTR;

	/* Sanity check to make sure rio is connected, powered, etc */

        if ( rio == NULL ||

             rio->present == 0 ||

             rio->rio_dev == NULL )

	{

        if (rio->present == 0 || rio->rio_dev == NULL) {

		mutex_unlock(&(rio->lock));

		return -ENODEV;

	}