summaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/drivers/ni_pcidio.c
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2014-07-16 11:02:07 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-16 13:37:20 -0700
commitfd28703c76977d7a5937d56865dc73ab49b8b405 (patch)
tree6eda102f8f9e7f98a7064f63bb4064a2676527cd /drivers/staging/comedi/drivers/ni_pcidio.c
parentc4c2c67a7af2a25545e060c8d386d1f0d9f06e15 (diff)
staging: comedi: ni_pcidio: checkpatch.pl cleanup (missing blank line)
Fix the checkpatch.pl warning: WARNING: Missing a blank line after declarations Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/ni_pcidio.c')
-rw-r--r--drivers/staging/comedi/drivers/ni_pcidio.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c
index 4d6b2ed9ac7b..ac800daa291a 100644
--- a/drivers/staging/comedi/drivers/ni_pcidio.c
+++ b/drivers/staging/comedi/drivers/ni_pcidio.c
@@ -711,6 +711,7 @@ static int ni_pcidio_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
{
int retval = setup_mite_dma(dev, s);
+
if (retval)
return retval;
}
@@ -853,6 +854,7 @@ static int pci_6534_load_fpga(struct comedi_device *dev,
}
for (j = 0; j + 1 < data_len;) {
unsigned int value = data[j++];
+
value |= data[j++] << 8;
writew(value,
devpriv->mite->daq_io_addr + Firmware_Data_Register);