From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Fri, 22 Jun 2012 23:35:57 +0000 (-0700)
Subject: staging: comedi: ni_daq_700: fix return for insn_config function
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=740b48be40761c0345a3c5e7ad077b7e4616bd13;p=openwrt%2Fstaging%2Fblogic.git

staging: comedi: ni_daq_700: fix return for insn_config function

The comedi insn_config functions should return < 0 for errors or
the number of data elements used to perform the command, this value
is available as 'insn->n'. Return that instead of the open coded
number to better indicate what the return means.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c
index 2ea3c8d5194c..cc469480ff4f 100644
--- a/drivers/staging/comedi/drivers/ni_daq_700.c
+++ b/drivers/staging/comedi/drivers/ni_daq_700.c
@@ -89,13 +89,12 @@ static int subdev_700_insn_config(struct comedi_device *dev,
 		break;
 	case INSN_CONFIG_DIO_QUERY:
 		data[1] = (s->io_bits & chan) ? COMEDI_OUTPUT : COMEDI_INPUT;
-		return insn->n;
 		break;
 	default:
 		return -EINVAL;
 	}
 
-	return 1;
+	return insn->n;
 }
 
 static int dio700_attach(struct comedi_device *dev, struct comedi_devconfig *it)