diff --git a/[refs] b/[refs]
index fd0355bc9431..7b6eb911e5d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9186ccdec5b60220e9f10b0ee68f13156d099a10
+refs/heads/master: e0f6959fbb318c1fb08c79503815b2cdd79d7554
diff --git a/trunk/drivers/staging/comedi/drivers/ni_660x.c b/trunk/drivers/staging/comedi/drivers/ni_660x.c
index 25459860b46a..3f8ac5668252 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_660x.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_660x.c
@@ -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];
 }