Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337204
b: refs/heads/master
c: e0f6959
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Oct 24, 2012
1 parent 0b0d9b7 commit 3d980ba
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9186ccdec5b60220e9f10b0ee68f13156d099a10
refs/heads/master: e0f6959fbb318c1fb08c79503815b2cdd79d7554
2 changes: 0 additions & 2 deletions trunk/drivers/staging/comedi/drivers/ni_660x.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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];
}

Expand Down

0 comments on commit 3d980ba

Please sign in to comment.