aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorStewart Robertson <stewart_r@aliencamel.com>2010-02-21 06:21:37 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-04 10:59:01 -0500
commit639b9f1ee5987270be2bca4bf8b7e6110d3b47ec (patch)
treeddd8ece50063d277539caa70d6d2588f1a3e588b /drivers/staging
parent65d6d26c6bcd802ebe2b22a29d9b6bbebfd8d7f8 (diff)
Staging: comedi: fix suspect code indent in ni_labpc.c
This is a patch to the ni_labpc.c file that fixes suspect code indent for conditional statements found by the checkpatch.pl tool Signed-off-by: Stewart Robertson <stewart_r@aliencamel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/comedi/drivers/ni_labpc.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c
index d6b5c05ee19..ddc3b0715dc 100644
--- a/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/drivers/staging/comedi/drivers/ni_labpc.c
@@ -583,8 +583,11 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase,
583 /* analog output */ 583 /* analog output */
584 s = dev->subdevices + 1; 584 s = dev->subdevices + 1;
585 if (thisboard->has_ao) { 585 if (thisboard->has_ao) {
586/* Could provide command support, except it only has a one sample 586 /*
587 * hardware buffer for analog output and no underrun flag. */ 587 * Could provide command support, except it only has a
588 * one sample hardware buffer for analog output and no
589 * underrun flag.
590 */
588 s->type = COMEDI_SUBD_AO; 591 s->type = COMEDI_SUBD_AO;
589 s->subdev_flags = SDF_READABLE | SDF_WRITABLE | SDF_GROUND; 592 s->subdev_flags = SDF_READABLE | SDF_WRITABLE | SDF_GROUND;
590 s->n_chan = NUM_AO_CHAN; 593 s->n_chan = NUM_AO_CHAN;
@@ -1356,7 +1359,10 @@ static irqreturn_t labpc_interrupt(int irq, void *d)
1356 } 1359 }
1357 1360
1358 if (devpriv->current_transfer == isa_dma_transfer) { 1361 if (devpriv->current_transfer == isa_dma_transfer) {
1359 /* if a dma terminal count of external stop trigger has occurred */ 1362 /*
1363 * if a dma terminal count of external stop trigger
1364 * has occurred
1365 */
1360 if (devpriv->status1_bits & DMATC_BIT || 1366 if (devpriv->status1_bits & DMATC_BIT ||
1361 (thisboard->register_layout == labpc_1200_layout 1367 (thisboard->register_layout == labpc_1200_layout
1362 && devpriv->status2_bits & A1_TC_BIT)) { 1368 && devpriv->status2_bits & A1_TC_BIT)) {