From 34b68400ee3aabda0cd0c951fca3b8e6fd96c015 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 8 Apr 2013 10:55:29 -0700 Subject: [PATCH] staging: comedi: drivers: set dev->board_name before attaching The comedi (*attach) and (*auto_attach) functions are used to attach legacy and PnP type devices to the comedi subsystem. If we can set the dev->board_name before doing the attach, the drivers will not have to worry about doing it. Drivers that do additional probing can still change the dev->board_name if necessary. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c index 8db9deed3bc6..09d67dac74bc 100644 --- a/drivers/staging/comedi/drivers.c +++ b/drivers/staging/comedi/drivers.c @@ -383,6 +383,8 @@ int comedi_device_attach(struct comedi_device *dev, struct comedi_devconfig *it) /* initialize dev->driver here so * comedi_error() can be called from attach */ dev->driver = driv; + dev->board_name = dev->board_ptr ? *(const char **)dev->board_ptr + : dev->driver->driver_name; ret = driv->attach(dev, it); if (ret >= 0) ret = comedi_device_postconfig(dev); @@ -423,6 +425,7 @@ int comedi_auto_config(struct device *hardware_device, /* Note: comedi_alloc_board_minor() locked dev->mutex. */ dev->driver = driver; + dev->board_name = dev->driver->driver_name; ret = driver->auto_attach(dev, context); if (ret >= 0) ret = comedi_device_postconfig(dev);