summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorRoman Tereshonkov <roman.tereshonkov@nokia.com>2010-04-16 09:52:59 +0000
committerGrant Likely <grant.likely@secretlab.ca>2010-04-28 01:14:05 -0600
commit8ec130a017ebd8b931344edde7013ffb18fa1965 (patch)
tree183138a6db30ce3f002c65cae7304c27927edaa9 /drivers/spi
parent9bd73715a1f83f640937c121d22fa8dbaab73002 (diff)
downloadop-kernel-dev-8ec130a017ebd8b931344edde7013ffb18fa1965.zip
op-kernel-dev-8ec130a017ebd8b931344edde7013ffb18fa1965.tar.gz
spi: release device claimed by bus_find_device_by_name
In success case the function bus_find_device_by_name calls get_device. In our context put_device should be called to decrease the device count usage. Signed-off-by: Roman Tereshonkov <roman.tereshonkov@nokia.com> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 9ffb0fd..ec429d1 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -257,6 +257,7 @@ int spi_add_device(struct spi_device *spi)
{
static DEFINE_MUTEX(spi_add_lock);
struct device *dev = spi->master->dev.parent;
+ struct device *d;
int status;
/* Chipselects are numbered 0..max; validate. */
@@ -278,10 +279,11 @@ int spi_add_device(struct spi_device *spi)
*/
mutex_lock(&spi_add_lock);
- if (bus_find_device_by_name(&spi_bus_type, NULL, dev_name(&spi->dev))
- != NULL) {
+ d = bus_find_device_by_name(&spi_bus_type, NULL, dev_name(&spi->dev));
+ if (d != NULL) {
dev_err(dev, "chipselect %d already in use\n",
spi->chip_select);
+ put_device(d);
status = -EBUSY;
goto done;
}
OpenPOWER on IntegriCloud