From d8bc11c67a5ea06037de24748daf02b1a4235058 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Mon, 15 Oct 2012 13:07:31 +0100 Subject: [PATCH] --- yaml --- r: 337095 b: refs/heads/master c: 0a7717dfe097d7a0a08e824ed39547c3e6e9d7e8 h: refs/heads/master i: 337093: 5d3829ee5a758d1d32d36665f7a7446b4f7a5bf2 337091: 2bb2f4b99d6e47f02e4bb09f51052d72a0ad603d 337087: 779650b07bffed6bb58f85460144981934e941a2 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedidev.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 185fd01d3ea4..aa23f21362c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f2f7e050bea242735880b7876d9771efb580213 +refs/heads/master: 0a7717dfe097d7a0a08e824ed39547c3e6e9d7e8 diff --git a/trunk/drivers/staging/comedi/comedidev.h b/trunk/drivers/staging/comedi/comedidev.h index cb67a5cb9c82..100ea0b0772c 100644 --- a/trunk/drivers/staging/comedi/comedidev.h +++ b/trunk/drivers/staging/comedi/comedidev.h @@ -436,9 +436,10 @@ into comedi's buffer */ static inline void comedi_set_hw_dev(struct comedi_device *dev, struct device *hw_dev) { + if (dev->hw_dev == hw_dev) + return; if (dev->hw_dev) put_device(dev->hw_dev); - dev->hw_dev = hw_dev; if (dev->hw_dev) { dev->hw_dev = get_device(dev->hw_dev);