From 161800c78dd2e4441ea02e6f0f439fe609dddf18 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Thu, 4 Apr 2013 14:59:00 +0100 Subject: [PATCH] --- yaml --- r: 363913 b: refs/heads/master c: db2e3487a5fa1f650680c672e0742d943039d2cc h: refs/heads/master i: 363911: 59e18da0cb825af4a0c94253ad1c2e052b1af527 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedi_fops.c | 1 + trunk/drivers/staging/comedi/drivers.c | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 25e96121d83f..cd9c32cc9e31 100644 --- 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 index 229be419b014..b3e533759174 100644 --- 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 index fe2ad91f5aab..81705fbfc018 100644 --- 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)