From ebf70fadd525573c4cab6ff809e8f473da01cbab Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 16 Mar 2009 22:04:18 -0400
Subject: [PATCH] --- yaml --- r: 141491 b: refs/heads/master c:
 dedd1325f1d53e2a2604457c4b3af9e62dde5001 h: refs/heads/master i:   141489:
 74b3d8c7c5c6589370cba8a49089b98581598188   141487:
 abed71c15e554dea20d3a10966bfc93eba4184a4 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/staging/comedi/drivers.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 78742c00a792..89ec92dd1011 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51b713a684d403bd672b3e4cac55db43dc5cca2d
+refs/heads/master: dedd1325f1d53e2a2604457c4b3af9e62dde5001
diff --git a/trunk/drivers/staging/comedi/drivers.c b/trunk/drivers/staging/comedi/drivers.c
index a252081b6a08..07456c0709dc 100644
--- a/trunk/drivers/staging/comedi/drivers.c
+++ b/trunk/drivers/staging/comedi/drivers.c
@@ -81,10 +81,8 @@ static void cleanup_device(comedi_device *dev)
 		dev->subdevices = NULL;
 		dev->n_subdevices = 0;
 	}
-	if (dev->private) {
-		kfree(dev->private);
-		dev->private = NULL;
-	}
+	kfree(dev->private);
+	dev->private = NULL;
 	dev->driver = 0;
 	dev->board_name = NULL;
 	dev->board_ptr = NULL;