diff options
-rw-r--r-- | drivers/staging/comedi/drivers/usbdux.c | 3 | ||||
-rw-r--r-- | drivers/staging/dt3155/allocator.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c index 86f035d00675..27b4cb2e2ec2 100644 --- 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) | |||
351 | int ret = 0; | 351 | int ret = 0; |
352 | 352 | ||
353 | if (!this_usbduxsub) { | 353 | if (!this_usbduxsub) { |
354 | dev_err(&this_usbduxsub->interface->dev, | 354 | pr_err("comedi?: usbdux_ai_stop: this_usbduxsub=NULL!\n"); |
355 | "comedi?: usbdux_ai_stop: this_usbduxsub=NULL!\n"); | ||
356 | return -EFAULT; | 355 | return -EFAULT; |
357 | } | 356 | } |
358 | dev_dbg(&this_usbduxsub->interface->dev, "comedi: usbdux_ai_stop\n"); | 357 | 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 bd5adbc2a238..d33947b0378f 100644 --- a/drivers/staging/dt3155/allocator.c +++ b/drivers/staging/dt3155/allocator.c | |||
@@ -176,9 +176,7 @@ int allocator_free_dma(unsigned long address) | |||
176 | prev = ptr; ptr = ptr->next; | 176 | prev = ptr; ptr = ptr->next; |
177 | 177 | ||
178 | if (!ptr) { | 178 | if (!ptr) { |
179 | printk(KERN_ERR ALL_MSG | 179 | pr_err(ALL_MSG "free_dma but add. not allocated\n"); |
180 | "free_dma(0x%08lx) but add. not allocated\n", | ||
181 | ptr->address); | ||
182 | return -EINVAL; | 180 | return -EINVAL; |
183 | } | 181 | } |
184 | PDEBUGG("freeing: %08lx (%li) next %08lx\n", ptr->address, ptr->size, | 182 | PDEBUGG("freeing: %08lx (%li) next %08lx\n", ptr->address, ptr->size, |