From f2cd49187c86c39d0a421170513034581b33fb6d Mon Sep 17 00:00:00 2001
From: Alan McIvor <alan.mcivor@reveal.co.nz>
Date: Tue, 22 Apr 2008 14:46:09 -0300
Subject: [PATCH] --- yaml --- r: 92518 b: refs/heads/master c:
 a4df8e1d6ae460546dfa3b4f23a85cb5a4255109 h: refs/heads/master v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/media/video/saa7134/saa7134-core.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2917753add26..1fca660541b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7bff4b4d3ad2b9ff42b4087f409076035af1d165
+refs/heads/master: a4df8e1d6ae460546dfa3b4f23a85cb5a4255109
diff --git a/trunk/drivers/media/video/saa7134/saa7134-core.c b/trunk/drivers/media/video/saa7134/saa7134-core.c
index 599273894f34..eec127864fe3 100644
--- a/trunk/drivers/media/video/saa7134/saa7134-core.c
+++ b/trunk/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;