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 */
 | 
					/* 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 @@
 | 
				
			||||||
#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;
 | 
				
			||||||
| 
						 | 
					@ -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;
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue