mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
V4L/DVB (6614): Fix driver for i386 architectures
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
2d4c0ac60d
commit
ef8c1888b3
2 changed files with 13 additions and 11 deletions
|
@ -82,13 +82,13 @@
|
|||
|
||||
/* Audio types */
|
||||
|
||||
#define V4L2_STD_A2_A (1L<<32)
|
||||
#define V4L2_STD_A2_B (1L<<33)
|
||||
#define V4L2_STD_NICAM_A (1L<<34)
|
||||
#define V4L2_STD_NICAM_B (1L<<35)
|
||||
#define V4L2_STD_AM (1L<<36)
|
||||
#define V4L2_STD_BTSC (1L<<37)
|
||||
#define V4L2_STD_EIAJ (1L<<38)
|
||||
#define V4L2_STD_A2_A (1LL<<32)
|
||||
#define V4L2_STD_A2_B (1LL<<33)
|
||||
#define V4L2_STD_NICAM_A (1LL<<34)
|
||||
#define V4L2_STD_NICAM_B (1LL<<35)
|
||||
#define V4L2_STD_AM (1LL<<36)
|
||||
#define V4L2_STD_BTSC (1LL<<37)
|
||||
#define V4L2_STD_EIAJ (1LL<<38)
|
||||
|
||||
#define V4L2_STD_A2 (V4L2_STD_A2_A | V4L2_STD_A2_B)
|
||||
#define V4L2_STD_NICAM (V4L2_STD_NICAM_A | V4L2_STD_NICAM_B)
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
#include <linux/dvb/frontend.h>
|
||||
#include "dvb_frontend.h"
|
||||
|
||||
|
||||
#define PREFIX "xc2028"
|
||||
|
||||
static int debug;
|
||||
|
@ -193,7 +194,7 @@ void dump_firm_type(unsigned int type)
|
|||
printk("SCODE ");
|
||||
}
|
||||
|
||||
static v4l2_std_id parse_audio_std_option(void)
|
||||
static v4l2_std_id parse_audio_std_option(void)
|
||||
{
|
||||
if (strcasecmp(audio_std, "A2"))
|
||||
return V4L2_STD_A2;
|
||||
|
@ -317,9 +318,10 @@ static int load_all_firmwares(struct dvb_frontend *fe)
|
|||
if ((!size) || (size + p > endp)) {
|
||||
tuner_err("Firmware type ");
|
||||
dump_firm_type(type);
|
||||
printk("(%x), id %lx is corrupted "
|
||||
"(size=%ld, expected %d)\n",
|
||||
type, (unsigned long)id, endp - p, size);
|
||||
printk("(%x), id %llx is corrupted "
|
||||
"(size=%d, expected %d)\n",
|
||||
type, id,
|
||||
(unsigned)(endp - p), size);
|
||||
goto corrupt;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue