]> Pileus Git - ~andy/linux/commitdiff
staging: comedi: ni_660x: remove BUG_ON(chan >= NUM_PFI_CHANNELS)
authorH Hartley Sweeten <hartleys@visionengravers.com>
Tue, 23 Oct 2012 23:28:14 +0000 (16:28 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 24 Oct 2012 03:30:29 +0000 (20:30 -0700)
This BUG_ON can never happen. The 'chan' value comes from the comedi
core in the insn->chanspec and will always be in range for the subdevice
number of channels (s->n_chan = NUM_PFI_CHANNELS).

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>
drivers/staging/comedi/drivers/ni_660x.c

index 25459860b46a0e175fe112b1350f330e571f6ebf..3f8ac566825240e5d708e4a3960081c3888c9524 100644 (file)
@@ -1106,7 +1106,6 @@ static int ni_660x_set_pfi_routing(struct comedi_device *dev, unsigned chan,
                if (source == pfi_output_select_do)
                        return -EINVAL;
        }
-       BUG_ON(chan >= NUM_PFI_CHANNELS);
 
        devpriv->pfi_output_selects[chan] = source;
        if (devpriv->pfi_direction_bits & (((uint64_t) 1) << chan))
@@ -1120,7 +1119,6 @@ static unsigned ni_660x_get_pfi_routing(struct comedi_device *dev,
 {
        struct ni_660x_private *devpriv = dev->private;
 
-       BUG_ON(chan >= NUM_PFI_CHANNELS);
        return devpriv->pfi_output_selects[chan];
 }