Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (5472): Isl6421: don't reference freed memory V4L/DVB (5441): Saa7146: Fix allocation of clipping memory V4L/DVB (5421): Fix suspend/resume in msp3400 and tuner V4L/DVB (5415): Msp_attach must return 0 if no msp3400 was found. V4L/DVB (5408): Fix SECAM handling on saa7115 V4L/DVB (5400): Core: fix several locking related problems V4L/DVB (5390): Radio: Fix error in Kbuild file V4L/DVB (5332): Ir_rc5_timer_end decoder lockup fix
This commit is contained in:
@@ -239,7 +239,8 @@ void saa7146_res_free(struct saa7146_fh *fh, unsigned int bits);
|
||||
#define SAA7146_HPS_SYNC_PORT_B 0x01
|
||||
|
||||
/* some memory sizes */
|
||||
#define SAA7146_CLIPPING_MEM (14*PAGE_SIZE)
|
||||
/* max. 16 clipping rectangles */
|
||||
#define SAA7146_CLIPPING_MEM (16 * 4 * sizeof(u32))
|
||||
|
||||
/* some defines for the various clipping-modes */
|
||||
#define SAA7146_CLIPPING_RECT 0x4
|
||||
|
||||
Reference in New Issue
Block a user