Commit 7a45ae6e authored Jan 07, 2014 by Bernd Porr Committed by Greg Kroah-Hartman Jan 09, 2014

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 <mail@berndporr.me.uk>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent bcb6232d

drivers/staging/comedi/drivers/usbduxsigma.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -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);