diff --git a/[refs] b/[refs]
index 83a997b3153d..e63e26d31536 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3dd98ebe532beb8d6a7ed22e16b8791e455f4e13
+refs/heads/master: 1f388811b54f9f1b78d52237edda1eaea109e900
diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.c b/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.c
index 1051fa5ce8f7..e9a4b43fda71 100644
--- a/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.c
+++ b/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.c
@@ -105,16 +105,19 @@ static int addi_auto_attach(struct comedi_device *dev,
 				      unsigned long context_unused)
 {
 	struct pci_dev *pcidev = comedi_to_pci_dev(dev);
-	const struct addi_board *this_board;
+	const struct addi_board *this_board = comedi_board(dev);
 	struct addi_private *devpriv;
 	struct comedi_subdevice *s;
 	int ret, n_subdevices;
 	unsigned int dw_Dummy;
 
-	this_board = addi_find_boardinfo(dev, pcidev);
-	if (!this_board)
-		return -ENODEV;
-	dev->board_ptr = this_board;
+	if (!this_board) {
+		/* The driver did not set the board_ptr, try finding it. */
+		this_board = addi_find_boardinfo(dev, pcidev);
+		if (!this_board)
+			return -ENODEV;
+		dev->board_ptr = this_board;
+	}
 	dev->board_name = this_board->pc_DriverName;
 
 	devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);