Merge tag 'tty-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[cascardo/linux.git] / drivers / staging / comedi / drivers / addi-data / hwdrv_apci1500.c

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
index a633957..1e2fe66 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
@@ -872,7 +872,8 @@ static int apci1500_do_write(struct comedi_device *dev,
                                        break;
 
                                default:
-                                       comedi_error(dev, " chan spec wrong");
+                                       dev_err(dev->class_dev,
+                                               "chan spec wrong\n");
                                        return -EINVAL; /*  "sorry channel spec wrong " */
 
                                }       /* switch(ui_NoOfChannels) */
@@ -950,8 +951,8 @@ static int apci1500_do_write(struct comedi_device *dev,
                                                break;
 
                                        default:
-                                               comedi_error(dev,
-                                                       " chan spec wrong");
+                                               dev_err(dev->class_dev,
+                                                       "chan spec wrong\n");
                                                return -EINVAL; /*  "sorry channel spec wrong " */
 
                                        }       /* switch(ui_NoOfChannels) */