From e91cdafbad7230a5818b5b62709f6102796de1c9 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Wed, 5 May 2010 02:59:48 -0300
Subject: [PATCH] --- yaml --- r: 193156 b: refs/heads/master c:
 b9245d80c375b93db79475ca231276e1fa5a7649 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/media/video/ov511.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 00402fe96e23..397c345565d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16ee9bb100340f9f775ab334acb645f54642f312
+refs/heads/master: b9245d80c375b93db79475ca231276e1fa5a7649
diff --git a/trunk/drivers/media/video/ov511.c b/trunk/drivers/media/video/ov511.c
index 6085d5582555..a10912097b7a 100644
--- a/trunk/drivers/media/video/ov511.c
+++ b/trunk/drivers/media/video/ov511.c
@@ -5940,7 +5940,7 @@ ov51x_disconnect(struct usb_interface *intf)
 	ov->dev = NULL;
 
 	/* Free the memory */
-	if (ov && !ov->user) {
+	if (!ov->user) {
 		mutex_lock(&ov->cbuf_lock);
 		kfree(ov->cbuf);
 		ov->cbuf = NULL;