From 64335f241cc53a8b1690f459b20abff79a27fcbf Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 8 Apr 2013 10:55:05 -0700 Subject: [PATCH] --- yaml --- r: 363964 b: refs/heads/master c: 6013a9a57bbe0fd147482297b04d3d848aa24b67 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index dcee41e004e4..9f98eeb94aed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 262235b13c22f6b7f84173f350964e71a849067d +refs/heads/master: 6013a9a57bbe0fd147482297b04d3d848aa24b67 diff --git a/trunk/drivers/staging/comedi/drivers.c b/trunk/drivers/staging/comedi/drivers.c index 81705fbfc018..8db9deed3bc6 100644 --- a/trunk/drivers/staging/comedi/drivers.c +++ b/trunk/drivers/staging/comedi/drivers.c @@ -397,7 +397,7 @@ int comedi_device_attach(struct comedi_device *dev, struct comedi_devconfig *it) int comedi_auto_config(struct device *hardware_device, struct comedi_driver *driver, unsigned long context) { - struct comedi_device *comedi_dev; + struct comedi_device *dev; int ret; if (!hardware_device) { @@ -417,18 +417,18 @@ int comedi_auto_config(struct device *hardware_device, return -EINVAL; } - comedi_dev = comedi_alloc_board_minor(hardware_device); - if (IS_ERR(comedi_dev)) - return PTR_ERR(comedi_dev); - /* Note: comedi_alloc_board_minor() locked comedi_dev->mutex. */ + dev = comedi_alloc_board_minor(hardware_device); + if (IS_ERR(dev)) + return PTR_ERR(dev); + /* Note: comedi_alloc_board_minor() locked dev->mutex. */ - comedi_dev->driver = driver; - ret = driver->auto_attach(comedi_dev, context); + dev->driver = driver; + ret = driver->auto_attach(dev, context); if (ret >= 0) - ret = comedi_device_postconfig(comedi_dev); + ret = comedi_device_postconfig(dev); if (ret < 0) - comedi_device_detach(comedi_dev); - mutex_unlock(&comedi_dev->mutex); + comedi_device_detach(dev); + mutex_unlock(&dev->mutex); if (ret < 0) comedi_release_hardware_device(hardware_device);