From 4812a0792a10efedbb3805c78b24bf8519979f08 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Fri, 1 Feb 2013 13:23:20 +0000 Subject: [PATCH] --- yaml --- r: 354343 b: refs/heads/master c: de06d7c6b8e3b886eec0302ecbadf76944a42ca4 h: refs/heads/master i: 354341: f6b7d24a8f9c66a96f06c59743621783b5ab096e 354339: 11be97d76388a4431a13db4c3e63b5229628185f 354335: 102c541c069da51cb915c880bd3babec6203f422 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers.c | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c8b16111a9b8..5cf81b7f37a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da71751177f35f0ca5494968cc237511c423a744 +refs/heads/master: de06d7c6b8e3b886eec0302ecbadf76944a42ca4 diff --git a/trunk/drivers/staging/comedi/drivers.c b/trunk/drivers/staging/comedi/drivers.c index 5adf9fc45de4..d91b173b1f40 100644 --- a/trunk/drivers/staging/comedi/drivers.c +++ b/trunk/drivers/staging/comedi/drivers.c @@ -45,14 +45,21 @@ struct comedi_driver *comedi_drivers; int comedi_set_hw_dev(struct comedi_device *dev, struct device *hw_dev) { - struct device *old_hw_dev = dev->hw_dev; - + if (hw_dev == dev->hw_dev) + return 0; + if (dev->hw_dev != NULL) + return -EEXIST; dev->hw_dev = get_device(hw_dev); - put_device(old_hw_dev); return 0; } EXPORT_SYMBOL_GPL(comedi_set_hw_dev); +static void comedi_clear_hw_dev(struct comedi_device *dev) +{ + put_device(dev->hw_dev); + dev->hw_dev = NULL; +} + int comedi_alloc_subdevices(struct comedi_device *dev, int num_subdevices) { struct comedi_subdevice *s; @@ -108,7 +115,7 @@ static void cleanup_device(struct comedi_device *dev) dev->write_subdev = NULL; dev->open = NULL; dev->close = NULL; - comedi_set_hw_dev(dev, NULL); + comedi_clear_hw_dev(dev); } static void __comedi_device_detach(struct comedi_device *dev)