summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/comedi/comedi_fops.c1
-rw-r--r--drivers/staging/comedi/drivers.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index 229be419b014..b3e533759174 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -2326,6 +2326,7 @@ struct comedi_device *comedi_alloc_board_minor(struct device *hardware_device)
info->device = dev;
info->hardware_device = hardware_device;
comedi_device_init(dev);
+ comedi_set_hw_dev(dev, hardware_device);
mutex_lock(&dev->mutex);
spin_lock(&comedi_file_info_table_lock);
for (i = hardware_device ? comedi_num_legacy_minors : 0;
diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index fe2ad91f5aab..81705fbfc018 100644
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -422,7 +422,6 @@ int comedi_auto_config(struct device *hardware_device,
return PTR_ERR(comedi_dev);
/* Note: comedi_alloc_board_minor() locked comedi_dev->mutex. */
- comedi_set_hw_dev(comedi_dev, hardware_device);
comedi_dev->driver = driver;
ret = driver->auto_attach(comedi_dev, context);
if (ret >= 0)