Commit e4681eba authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman

staging: comedi: amplc_dio200: set board_name before common attach

`dio200_common_attach()` is called from `dio200_attach()` for ISA boards
and from `dio200_auto_attach()` for PCI boards.  `dio200_auto_attach()`
assigns `dev->board_name` (where `dev` is the `struct comedi_device *`
under consideration) before calling `dio200_common_attach()`.  Do the
same in `dio200_attach()` so it can be used there before the call to
`dio200_common_attach()`.  This makes the assignment in
`dio200_common_attach()` unnessary, so remove the assignment from there.
Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 01d03a93
......@@ -1738,7 +1738,6 @@ static int dio200_common_attach(struct comedi_device *dev, unsigned int irq,
int ret;
devpriv->intr_sd = -1;
dev->board_name = thisboard->name;
ret = comedi_alloc_subdevices(dev, layout->n_subdevs);
if (ret)
......@@ -1818,6 +1817,7 @@ static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (!DO_ISA)
return -EINVAL;
dev->board_name = thisboard->name;
dev_info(dev->class_dev, DIO200_DRIVER_NAME ": attach\n");
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment