Skip to contentSkip to conversation

USB rio500.c: fix check-after-use

PATCH In review Adrian Bunk 2 participants 2 messages Oct 18, 2007 USB

lore
Share & tools
lore

Adrian Bunk

author
#0 lore raw

PATCH 1/1 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 Adrian Bunk <[email protected]>

---

 drivers/usb/misc/rio500.c |   15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

19cc945c5387e84123f654e1d7e7c79d29b3516c

drivers/usb/misc/rio500.c +3 -12
index 88f6abe..330c18e 100644
@@ -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;
 	}
#1 lore raw

Am Donnerstag 18 Oktober 2007 schrieb Adrian Bunk:

Quoted 5 lines

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.

Looking good.

Regards
Oliver