From 106dd3c9289aaf68e5f5198f0408b0636041a032 Mon Sep 17 00:00:00 2001
From: Andy Walls <awalls@radix.net>
Date: Mon, 12 May 2008 15:01:27 -0300
Subject: [PATCH] --- yaml --- r: 96703 b: refs/heads/master c:
 07c87a833e9ef92280ed24ab85cd4eb49cbca9c0 h: refs/heads/master i:   96701:
 660afb85283ed49d4acf17a94c7446612bdacc88   96699:
 27499eefe81c86699ce2c7bd36ae3a815d9ae074   96695:
 346be13dba09f2dbf9644ed44825ec488c6b713e   96687:
 2e14ae6ef6675e001e929fca3e0465f14acb7987   96671:
 a057b08866a3373ef035b0672408a8c888acffbf   96639:
 d8dcfd93c5261dadb7538e8452db6ec11073435b v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/media/video/cx18/cx18-fileops.c | 2 ++
 trunk/drivers/media/video/ivtv/ivtv-fileops.c | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6b53b0b7c0c6..f82ef6e775b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cba627a51a26eaed3526c423f5fd0410dd721ae2
+refs/heads/master: 07c87a833e9ef92280ed24ab85cd4eb49cbca9c0
diff --git a/trunk/drivers/media/video/cx18/cx18-fileops.c b/trunk/drivers/media/video/cx18/cx18-fileops.c
index 91eff6e671a7..0b3141db174b 100644
--- a/trunk/drivers/media/video/cx18/cx18-fileops.c
+++ b/trunk/drivers/media/video/cx18/cx18-fileops.c
@@ -662,6 +662,8 @@ int cx18_v4l2_open(struct inode *inode, struct file *filp)
 	for (x = 0; cx == NULL && x < cx18_cards_active; x++) {
 		/* find out which stream this open was on */
 		for (y = 0; y < CX18_MAX_STREAMS; y++) {
+			if (cx18_cards[x] == NULL)
+				continue;
 			s = &cx18_cards[x]->streams[y];
 			if (s->v4l2dev && s->v4l2dev->minor == minor) {
 				cx = cx18_cards[x];
diff --git a/trunk/drivers/media/video/ivtv/ivtv-fileops.c b/trunk/drivers/media/video/ivtv/ivtv-fileops.c
index 2b74b0ab1477..f2fa434b677b 100644
--- a/trunk/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/trunk/drivers/media/video/ivtv/ivtv-fileops.c
@@ -987,6 +987,8 @@ int ivtv_v4l2_open(struct inode *inode, struct file *filp)
 	/* Find which card this open was on */
 	spin_lock(&ivtv_cards_lock);
 	for (x = 0; itv == NULL && x < ivtv_cards_active; x++) {
+		if (ivtv_cards[x] == NULL)
+			continue;
 		/* find out which stream this open was on */
 		for (y = 0; y < IVTV_MAX_STREAMS; y++) {
 			s = &ivtv_cards[x]->streams[y];