diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 599273894f342a1e84a34ea0464bb3074accc4fa..eec127864fe3e710832a34275c337b51819cf53b 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -866,6 +866,9 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
 	int err;
 	int mask;
 
+	if (saa7134_devcount == SAA7134_MAXBOARDS)
+		return -ENOMEM;
+
 	dev = kzalloc(sizeof(*dev),GFP_KERNEL);
 	if (NULL == dev)
 		return -ENOMEM;