---

yaml --- r: 337095 b: refs/heads/master c: 0a7717d h: refs/heads/master i: 337093: 5d3829e 337091: 2bb2f4b 337087: 779650b v: v3
git-mirror · Oct 22, 2012 · d8bc11c · d8bc11c
1 parent 5cf4c99
commit d8bc11c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);