From 4ff09d7f4d4eb468397eac085bde85542b85d7e8 Mon Sep 17 00:00:00 2001
From: Sigmund Augdal Helberg <sigmund@snap.tv>
Date: Wed, 21 Jun 2006 10:35:48 -0300
Subject: [PATCH] --- yaml --- r: 30049 b: refs/heads/master c:
 77e0be12100a3d40abfa46ef54c323b6cfff41ed h: refs/heads/master i:   30047:
 14fd0cc48210f619a185198cdfb41fb3cf7d721c v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/media/dvb/bt8xx/bt878.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a10b05c03c84..7ed1df0ac623 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b32474cb8341bb828f2c2800d5dd615b7cd02182
+refs/heads/master: 77e0be12100a3d40abfa46ef54c323b6cfff41ed
diff --git a/trunk/drivers/media/dvb/bt8xx/bt878.c b/trunk/drivers/media/dvb/bt8xx/bt878.c
index 5500f8a0ffe2..47281c905149 100644
--- a/trunk/drivers/media/dvb/bt8xx/bt878.c
+++ b/trunk/drivers/media/dvb/bt8xx/bt878.c
@@ -417,6 +417,11 @@ static int __devinit bt878_probe(struct pci_dev *dev,
 
 	printk(KERN_INFO "bt878: Bt878 AUDIO function found (%d).\n",
 	       bt878_num);
+	if (bt878_num >= BT878_MAX) {
+		printk(KERN_ERR "bt878: Too many devices inserted\n");
+		result = -ENOMEM;
+		goto fail0;
+	}
 	if (pci_enable_device(dev))
 		return -EIO;