From 4fe989725b4407f4e98aa666085ea8cb529b5317 Mon Sep 17 00:00:00 2001
From: Janne Grunau <janne-dvb@grunau.be>
Date: Thu, 24 Apr 2008 20:19:22 -0300
Subject: [PATCH] --- yaml --- r: 93599 b: refs/heads/master c:
 094f9b4b317b235b8d7fa03b356b9a3f3633b55b h: refs/heads/master i:   93597:
 386102b126613a3c321d5c24115507c9d593c9b2   93595:
 b0a257d7e4fbae37e5520fcdf461a26a885dc1dc   93591:
 9dfe7eae14816712703f6dc6e6f37d32f3db45d7   93583:
 43c5f778426888197dfea0c10040c4079b7fada7   93567:
 8e59a7eaf50512e9f2b063cc52a83980efbdb6c4 v: v3

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

diff --git a/[refs] b/[refs]
index 241f16af5068..ec6216690f1f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50fa46b25490039ef51ef0dc8afdded60c4d3b59
+refs/heads/master: 094f9b4b317b235b8d7fa03b356b9a3f3633b55b
diff --git a/trunk/drivers/media/video/em28xx/em28xx-core.c b/trunk/drivers/media/video/em28xx/em28xx-core.c
index f8c41d8c74c4..5d837c16ee22 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-core.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-core.c
@@ -650,7 +650,7 @@ int em28xx_init_isoc(struct em28xx *dev, int max_packets,
 
 	dev->isoc_ctl.transfer_buffer = kzalloc(sizeof(void *)*num_bufs,
 					      GFP_KERNEL);
-	if (!dev->isoc_ctl.urb) {
+	if (!dev->isoc_ctl.transfer_buffer) {
 		em28xx_errdev("cannot allocate memory for usbtransfer\n");
 		kfree(dev->isoc_ctl.urb);
 		return -ENOMEM;