aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/ngene/ngene.h
diff options
context:
space:
mode:
authorDevin Heitmueller <dheitmueller@kernellabs.com>2010-03-13 14:40:46 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-19 11:59:06 -0400
commitfdafc96c9162bdc58192a400bad5b850e185977d (patch)
tree809dc24d1d4f7a25ce4700a08e50135217478f4d /drivers/media/dvb/ngene/ngene.h
parent668293a06e3866a3aaa60c523ba4f8f19bfddba1 (diff)
V4L/DVB: ngene: properly support boards where channel 0 isn't a TS input
The current code assumes that channel zero is always a TS input, which would result in an oops if the "one_adapter" modprobe option is 1 (which it is by default) and the board in question has something else on channel zero (which is the case for the Avermedia m780, which has it's analog input wired to UVI1) The code now explicitly tracks the first adapter created and ensures that other channels cannot accidentially be associated with a NULL adapter. Also, eliminate what appears to be a typo where all of the channel parameters are getting associated with stream zero's properties, which will work if you happen to have a dual stream board with the exact same configuration, but if they differ then the second stream is going to end up with the first stream's configuration. Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/ngene/ngene.h')
-rw-r--r--drivers/media/dvb/ngene/ngene.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/dvb/ngene/ngene.h b/drivers/media/dvb/ngene/ngene.h
index a7eb29846310..ca3af5c6238f 100644
--- a/drivers/media/dvb/ngene/ngene.h
+++ b/drivers/media/dvb/ngene/ngene.h
@@ -752,6 +752,7 @@ struct ngene {
752 spinlock_t cmd_lock; 752 spinlock_t cmd_lock;
753 753
754 struct dvb_adapter adapter[MAX_STREAM]; 754 struct dvb_adapter adapter[MAX_STREAM];
755 struct dvb_adapter *first_adapter; /* "one_adapter" modprobe opt */
755 struct ngene_channel channel[MAX_STREAM]; 756 struct ngene_channel channel[MAX_STREAM];
756 757
757 struct ngene_info *card_info; 758 struct ngene_info *card_info;