Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ef8c1888b32132ae48553a8ce00d5858ec3e9b51
Commit: ef8c1888b32132ae48553a8ce00d5858ec3e9b51
Parent: 2d4c0ac60dbcdee83da5bdebc661c2c145938d8a
Author: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
AuthorDate: Fri Nov 16 16:28:21 2007 -0300
Committer: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Fri Jan 25 19:02:15 2008 -0200
V4L/DVB (6614): Fix driver for i386 architectures
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
drivers/media/video/tuner-xc2028-types.h | 14 +++++++-------
drivers/media/video/tuner-xc2028.c | 10 ++++++----
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/drivers/media/video/tuner-xc2028-types.h
b/drivers/media/video/tuner-xc2028-types.h
index 3888844..a9e2e05 100644
--- a/drivers/media/video/tuner-xc2028-types.h
+++ b/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/drivers/media/video/tuner-xc2028.c
b/drivers/media/video/tuner-xc2028.c
index 748f9ad..d23b33a 100644
--- a/drivers/media/video/tuner-xc2028.c
+++ b/drivers/media/video/tuner-xc2028.c
@@ -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;
}
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
