From 243ed7ceb400da2e92a3f9ae1f75b13e47a74806 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 16 Nov 2007 16:28:21 -0300 Subject: [PATCH] --- yaml --- r: 76425 b: refs/heads/master c: ef8c1888b32132ae48553a8ce00d5858ec3e9b51 h: refs/heads/master i: 76423: f43b6322b177170324cff4e2f71d0badf35c50e5 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/tuner-xc2028-types.h | 14 +++++++------- trunk/drivers/media/video/tuner-xc2028.c | 10 ++++++---- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 5493a2f90f47..d7cb4ae69297 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d4c0ac60dbcdee83da5bdebc661c2c145938d8a +refs/heads/master: ef8c1888b32132ae48553a8ce00d5858ec3e9b51 diff --git a/trunk/drivers/media/video/tuner-xc2028-types.h b/trunk/drivers/media/video/tuner-xc2028-types.h index 388884491f47..a9e2e0562d99 100644 --- a/trunk/drivers/media/video/tuner-xc2028-types.h +++ b/trunk/drivers/media/video/tuner-xc2028-types.h @@ -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) diff --git a/trunk/drivers/media/video/tuner-xc2028.c b/trunk/drivers/media/video/tuner-xc2028.c index 748f9ad08b88..d23b33a1f696 100644 --- a/trunk/drivers/media/video/tuner-xc2028.c +++ b/trunk/drivers/media/video/tuner-xc2028.c @@ -22,6 +22,7 @@ #include #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; }