From 69c82ab5bae5b65cd7b2e8f738aa34b068223a64 Mon Sep 17 00:00:00 2001
From: Henrik Kretzschmar <henne@nachtwindheim.de>
Date: Fri, 22 Aug 2008 17:13:05 -0300
Subject: [PATCH] --- yaml --- r: 113850 b: refs/heads/master c:
 ef0e3c26efe9c52de62b96fdad94de3ed70489d0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c7677b6c0f17..b53abdc9cb9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eda9e4e29492aff55ceb3f719a6011bddc60a892
+refs/heads/master: ef0e3c26efe9c52de62b96fdad94de3ed70489d0
diff --git a/trunk/drivers/media/video/meye.c b/trunk/drivers/media/video/meye.c
index cdaff2fdf394..102a5b9cfd12 100644
--- a/trunk/drivers/media/video/meye.c
+++ b/trunk/drivers/media/video/meye.c
@@ -1779,6 +1779,7 @@ static int __devinit meye_probe(struct pci_dev *pcidev,
 		goto outnotdev;
 	}
 
+	ret = -ENOMEM;
 	meye.mchip_dev = pcidev;
 	meye.video_dev = video_device_alloc();
 	if (!meye.video_dev) {
@@ -1786,7 +1787,6 @@ static int __devinit meye_probe(struct pci_dev *pcidev,
 		goto outnotdev;
 	}
 
-	ret = -ENOMEM;
 	meye.grab_temp = vmalloc(MCHIP_NB_PAGES_MJPEG * PAGE_SIZE);
 	if (!meye.grab_temp) {
 		printk(KERN_ERR "meye: grab buffer allocation failed\n");