---

yaml --- r: 363913 b: refs/heads/master c: db2e348 h: refs/heads/master i: 363911: 59e18da v: v3
git-mirror · Apr 5, 2013 · 161800c · 161800c
1 parent 3993c2a
commit 161800c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74ece108f9e55e7967d24a61e30f43e3aceb4809
+refs/heads/master: db2e3487a5fa1f650680c672e0742d943039d2cc
diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/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/trunk/drivers/staging/comedi/drivers.c b/trunk/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)