Staging: Eliminate a NULL pointer dereference

Eliminate a NULL or near NULL pointer dereference.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@r exists@
expression E,E1;
identifier f;
statement S1,S2,S3;
@@

if ((E == NULL && ...) || ...)
{
  ... when != if (...) S1 else S2
      when != E = E1
* E->f
  ... when any
  return ...;
}
else S3
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c
index 86f035d00675067b8d020cbc90ad4b2ca97eaaf5..27b4cb2e2ec2924928b44089c92dc61ee9bab87a 100644 (file)
--- a/drivers/staging/comedi/drivers/usbdux.c
+++ b/drivers/staging/comedi/drivers/usbdux.c
@@ -351,8 +351,7 @@ static int usbdux_ai_stop(struct usbduxsub *this_usbduxsub, int do_unlink)
        int ret = 0;
 
        if (!this_usbduxsub) {
-               dev_err(&this_usbduxsub->interface->dev,
-                       "comedi?: usbdux_ai_stop: this_usbduxsub=NULL!\n");
+               pr_err("comedi?: usbdux_ai_stop: this_usbduxsub=NULL!\n");
                return -EFAULT;
        }
        dev_dbg(&this_usbduxsub->interface->dev, "comedi: usbdux_ai_stop\n");

diff --git a/drivers/staging/dt3155/allocator.c b/drivers/staging/dt3155/allocator.c
index bd5adbc2a238fbeb2f1b4fa56e9709f651fbcf02..d33947b0378f0a809533f3133d125213c588e43e 100644 (file)
--- a/drivers/staging/dt3155/allocator.c
+++ b/drivers/staging/dt3155/allocator.c
@@ -176,9 +176,7 @@ int allocator_free_dma(unsigned long address)
        prev = ptr; ptr = ptr->next;
 
        if (!ptr) {
-               printk(KERN_ERR ALL_MSG
-                       "free_dma(0x%08lx) but add. not allocated\n",
-                       ptr->address);
+               pr_err(ALL_MSG "free_dma but add. not allocated\n");
                return -EINVAL;
        }
        PDEBUGG("freeing: %08lx (%li) next %08lx\n", ptr->address, ptr->size,