Commit ef8c1888 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

V4L/DVB (6614): Fix driver for i386 architectures

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 2d4c0ac6
...@@ -82,13 +82,13 @@ ...@@ -82,13 +82,13 @@
/* Audio types */ /* Audio types */
#define V4L2_STD_A2_A (1L<<32) #define V4L2_STD_A2_A (1LL<<32)
#define V4L2_STD_A2_B (1L<<33) #define V4L2_STD_A2_B (1LL<<33)
#define V4L2_STD_NICAM_A (1L<<34) #define V4L2_STD_NICAM_A (1LL<<34)
#define V4L2_STD_NICAM_B (1L<<35) #define V4L2_STD_NICAM_B (1LL<<35)
#define V4L2_STD_AM (1L<<36) #define V4L2_STD_AM (1LL<<36)
#define V4L2_STD_BTSC (1L<<37) #define V4L2_STD_BTSC (1LL<<37)
#define V4L2_STD_EIAJ (1L<<38) #define V4L2_STD_EIAJ (1LL<<38)
#define V4L2_STD_A2 (V4L2_STD_A2_A | V4L2_STD_A2_B) #define V4L2_STD_A2 (V4L2_STD_A2_A | V4L2_STD_A2_B)
#define V4L2_STD_NICAM (V4L2_STD_NICAM_A | V4L2_STD_NICAM_B) #define V4L2_STD_NICAM (V4L2_STD_NICAM_A | V4L2_STD_NICAM_B)
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <linux/dvb/frontend.h> #include <linux/dvb/frontend.h>
#include "dvb_frontend.h" #include "dvb_frontend.h"
#define PREFIX "xc2028" #define PREFIX "xc2028"
static int debug; static int debug;
...@@ -193,7 +194,7 @@ void dump_firm_type(unsigned int type) ...@@ -193,7 +194,7 @@ void dump_firm_type(unsigned int type)
printk("SCODE "); 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")) if (strcasecmp(audio_std, "A2"))
return V4L2_STD_A2; return V4L2_STD_A2;
...@@ -317,9 +318,10 @@ static int load_all_firmwares(struct dvb_frontend *fe) ...@@ -317,9 +318,10 @@ static int load_all_firmwares(struct dvb_frontend *fe)
if ((!size) || (size + p > endp)) { if ((!size) || (size + p > endp)) {
tuner_err("Firmware type "); tuner_err("Firmware type ");
dump_firm_type(type); dump_firm_type(type);
printk("(%x), id %lx is corrupted " printk("(%x), id %llx is corrupted "
"(size=%ld, expected %d)\n", "(size=%d, expected %d)\n",
type, (unsigned long)id, endp - p, size); type, id,
(unsigned)(endp - p), size);
goto corrupt; goto corrupt;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment