From a192e476d261c5996da7571c09ccb43bd761668f Mon Sep 17 00:00:00 2001
From: "Figo.zhang" <figo1802@gmail.com>
Date: Sat, 6 Jun 2009 19:11:31 +0800
Subject: [PATCH] --- yaml --- r: 161999 b: refs/heads/master c:
 b455073c885cf78cfea1704ce9587806ec8e3c30 h: refs/heads/master i:   161997:
 2a159f6a4f884813b06e1c1190f1555157cd6d17   161995:
 9c701d8aac9e2177f11611d3a483fb8dc74d6643   161991:
 80250c8b7e5d7da27ae758e216a0b03d307fc6c1   161983:
 e217ddc99230d7417d11e93de4c226dd29decbc5 v: v3

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

diff --git a/[refs] b/[refs]
index 980dbae08635..100425269996 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a85b6f0ab0d2edb0d41b32697111ce0e4f43496
+refs/heads/master: b455073c885cf78cfea1704ce9587806ec8e3c30
diff --git a/trunk/drivers/staging/comedi/drivers.c b/trunk/drivers/staging/comedi/drivers.c
index 5157c89ec4ee..dc53aeeac68f 100644
--- a/trunk/drivers/staging/comedi/drivers.c
+++ b/trunk/drivers/staging/comedi/drivers.c
@@ -509,9 +509,8 @@ int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,
 			async->prealloc_buf =
 			    vmap(pages, n_pages, VM_MAP, PAGE_KERNEL_NOCACHE);
 		}
-		if (pages) {
-			vfree(pages);
-		}
+		vfree(pages);
+
 		if (async->prealloc_buf == NULL) {
 			/* Some allocation failed above. */
 			if (async->buf_page_list) {