diff --git a/[refs] b/[refs]
index aa23f21362c2..910cac1f38b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a7717dfe097d7a0a08e824ed39547c3e6e9d7e8
+refs/heads/master: 26cbd46529c07b50e92861f06497a5f327c48e69
diff --git a/trunk/drivers/staging/comedi/drivers.c b/trunk/drivers/staging/comedi/drivers.c
index 1db6bfdbf13b..09e1daf95767 100644
--- a/trunk/drivers/staging/comedi/drivers.c
+++ b/trunk/drivers/staging/comedi/drivers.c
@@ -860,6 +860,7 @@ comedi_auto_config_helper(struct device *hardware_device,
 	else if (!try_module_get(driver->module))
 		ret = -EIO;
 	else {
+		comedi_set_hw_dev(comedi_dev, hardware_device);
 		/* set comedi_dev->driver here for attach wrapper */
 		comedi_dev->driver = driver;
 		ret = (*attach_wrapper)(comedi_dev, context);