Merge commit 'v2.6.26-rc9' into sched/devel

[linux-2.6-omap-h63xx.git] / drivers / media / video / em28xx / em28xx-core.c

diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index f8c41d8c74c4173be55d517b1647b2bf244d27bf..5d837c16ee22ad10908cce01c0ef0d89768f14ed 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/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;