From: Ian Abbott Date: Mon, 15 Oct 2012 12:07:32 +0000 (+0100) Subject: staging: comedi: always set hw_dev during auto-config X-Git-Tag: next-20121023~24^2~81 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=26cbd46529c07b50e92861f06497a5f327c48e69;p=karo-tx-linux.git staging: comedi: always set hw_dev during auto-config Auto-configuration (auto-attachment) of USB and PCI comedi devices all goes through `comedi_auto_config_helper()`. That is a good place to set the comedi device's `hw_dev` pointer to the hardware `struct device` via a call to `comedi_set_hw_dev(comedi_device, hardware_device)` as it may obviate the need for the low-level comedi driver to make this call. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c index 1db6bfdbf13b..09e1daf95767 100644 --- a/drivers/staging/comedi/drivers.c +++ b/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);