Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f388811 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: addi_common: allow driver to set the board_ptr 



The addi_apci_035, addi_apci_1500, addi_apci_1564, and addi_apci_3xxx
drivers still use the addi_common code. Allow those drivers to set
the dev->board_ptr before calling addi_auto_attach().

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3dd98ebe

drivers/staging/comedi/drivers/addi-data/addi_common.c

+8 −5
Original line number Diff line number Diff line
@@ -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;



	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);