Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
index c841914c0244..3170b8f72c68 100644
--- a/drivers/media/video/cx88/cx88-alsa.c
+++ b/drivers/media/video/cx88/cx88-alsa.c
@@ -676,6 +676,11 @@ static int __devinit snd_cx88_create(struct snd_card *card,
         chip = (snd_cx88_card_t *) card->private_data;
 
         core = cx88_core_get(pci);
+        if (NULL == core) {
+                err = -EINVAL;
+                kfree (chip);
+                return err;
+        }
 
         if (!pci_dma_supported(pci,0xffffffff)) {
                 dprintk(0, "%s/1: Oops: no 32bit PCI DMA ???\n",core->name);
@@ -692,11 +697,6 @@ static int __devinit snd_cx88_create(struct snd_card *card,
         spin_lock_init(&chip->reg_lock);
 
         cx88_reset(core);
-        if (NULL == core) {
-                err = -EINVAL;
-                kfree (chip);
-                return err;
-        }
         chip->core = core;
 
         /* get irq */