From bec178cd0ec02cef628784e248af37090229dc45 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 8 Apr 2013 10:55:29 -0700 Subject: [PATCH] --- yaml --- r: 363965 b: refs/heads/master c: 34b68400ee3aabda0cd0c951fca3b8e6fd96c015 h: refs/heads/master i: 363963: c336fc0f2690921e7a8d33ed6354b758ae7f8702 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9f98eeb94aed..70ae29706904 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6013a9a57bbe0fd147482297b04d3d848aa24b67 +refs/heads/master: 34b68400ee3aabda0cd0c951fca3b8e6fd96c015 diff --git a/trunk/drivers/staging/comedi/drivers.c b/trunk/drivers/staging/comedi/drivers.c index 8db9deed3bc6..09d67dac74bc 100644 --- a/trunk/drivers/staging/comedi/drivers.c +++ b/trunk/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);