1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index b9def8cbcdab..348f6ef08b2a 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -3127,6 +3127,8 @@ struct cx88_core *cx88_core_create(struct pci_dev *pci, int nr)
         int i;
 
         core = kzalloc(sizeof(*core), GFP_KERNEL);
+        if (core == NULL)
+                return NULL;
 
         atomic_inc(&core->refcount);
         core->pci_bus  = pci->bus->number;
@@ -3157,6 +3159,11 @@ struct cx88_core *cx88_core_create(struct pci_dev *pci, int nr)
                               pci_resource_len(pci, 0));
         core->bmmio = (u8 __iomem *)core->lmmio;
 
+        if (core->lmmio == NULL) {
+                kfree(core);
+                return NULL;
+        }
+
         /* board config */
         core->boardnr = UNSET;
         if (card[core->nr] < ARRAY_SIZE(cx88_boards))