From 46828a56f24a9121a4a3de33e1985fc4532c017c Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 3 Feb 2014 10:43:26 -0700 Subject: [PATCH] staging: comedi: amplc_pc236: remove dev_err() message due to allocation failure The subdev_8255_init() call can only fail due to the allocation of the private data. This failure will alreay have produced an error message. Remove the redundant dev_err(). Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/amplc_pc236.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/staging/comedi/drivers/amplc_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c index 31734e1142fd..12eabd6b4978 100644 --- a/drivers/staging/comedi/drivers/amplc_pc236.c +++ b/drivers/staging/comedi/drivers/amplc_pc236.c @@ -411,10 +411,9 @@ static int pc236_common_attach(struct comedi_device *dev, unsigned long iobase, s = &dev->subdevices[0]; /* digital i/o subdevice (8255) */ ret = subdev_8255_init(dev, s, NULL, iobase); - if (ret < 0) { - dev_err(dev->class_dev, "error! out of memory!\n"); + if (ret) return ret; - } + s = &dev->subdevices[1]; dev->read_subdev = s; s->type = COMEDI_SUBD_UNUSED; -- 2.20.1