From 7a45ae6edf808821a9799eccd9043177463aa05f Mon Sep 17 00:00:00 2001 From: Bernd Porr Date: Tue, 7 Jan 2014 21:43:10 +0000 Subject: [PATCH] staging: comedi: usbduxsigma: return failure of auto attach The function usbduxsigma_getstatusinfo() returns a negative value in case there has been a communication error with the board. This should always work and if this communication fails then there is something seriously wrong with the board. This is now returned to the caller so that it can terminte the auto attachement. The return command also prevents printing out the offset value in case of a fault. Signed-off-by: Bernd Porr Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/usbduxsigma.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/usbduxsigma.c b/drivers/staging/comedi/drivers/usbduxsigma.c index 194c686c5a42..ff521b3a07d0 100644 --- a/drivers/staging/comedi/drivers/usbduxsigma.c +++ b/drivers/staging/comedi/drivers/usbduxsigma.c @@ -1655,9 +1655,11 @@ static int usbduxsigma_auto_attach(struct comedi_device *dev, } offset = usbduxsigma_getstatusinfo(dev, 0); - if (offset < 0) + if (offset < 0) { dev_err(dev->class_dev, - "Communication to USBDUXSIGMA failed! Check firmware and cabling\n"); + "Communication to USBDUXSIGMA failed! Check firmware and cabling.\n"); + return offset; + } dev_info(dev->class_dev, "attached, ADC_zero = %x\n", offset);