]> err.no Git - linux-2.6/commitdiff
V4L/DVB (5513): Bt878: prevent probing wrong card entry
authorAkinobu Mita <akinobu.mita@gmail.com>
Sat, 14 Apr 2007 13:24:15 +0000 (10:24 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Fri, 27 Apr 2007 18:45:39 +0000 (15:45 -0300)
I got strange message when I did modprobe bt878:
bt878_probe: card id=[0x0],[ <NULL> ] has DVB functions.
The card_list array is terminated by sentinel entry.
But this list is traversed by:
for (i = 0, dvb_cards = card_list; i < ARRAY_SIZE(card_list);
     i++, dvb_cards++) {
...
}
in bt878_probe().
So this loop checks dummy sentinel entry, too.
This patch removes unnecessary sentinel entry.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/dvb/bt8xx/bt878.c

index 83b090ef244555d782571eecc95a508675a8af59..df72b4b8ee103d5284790e0c8c85169272a6a912 100644 (file)
@@ -393,9 +393,7 @@ static struct cards card_list[] __devinitdata = {
        { 0xdb1118ac, BTTV_BOARD_DVICO_DVBT_LITE,               "Ultraview DVB-T Lite" },
        { 0xd50018ac, BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE,       "DViCO FusionHDTV 5 Lite" },
        { 0x20007063, BTTV_BOARD_PC_HDTV,                       "pcHDTV HD-2000 TV" },
-       { 0x00261822, BTTV_BOARD_TWINHAN_DST,                   "DNTV Live! Mini" },
-
-       { 0, -1, NULL }
+       { 0x00261822, BTTV_BOARD_TWINHAN_DST,                   "DNTV Live! Mini" }
 };