diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-27 12:23:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-27 12:23:59 -0400 |
| commit | d0d87aae795bfad0a9f8cc1e8faff5a016e71ad4 (patch) | |
| tree | 1f0ca16422120a0c6fc0ce8d45558e54a3ee713b /include | |
| parent | 5158074971220eeaa0677942a4bad3b3439a9638 (diff) | |
| parent | 09d4895488d4df5c58b739573846f514ceabc911 (diff) | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/saa7146_vv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h index 83fe2e3d1e25..50e33b0e9349 100644 --- a/include/media/saa7146_vv.h +++ b/include/media/saa7146_vv.h | |||
| @@ -239,7 +239,8 @@ void saa7146_res_free(struct saa7146_fh *fh, unsigned int bits); | |||
| 239 | #define SAA7146_HPS_SYNC_PORT_B 0x01 | 239 | #define SAA7146_HPS_SYNC_PORT_B 0x01 |
| 240 | 240 | ||
| 241 | /* some memory sizes */ | 241 | /* some memory sizes */ |
| 242 | #define SAA7146_CLIPPING_MEM (14*PAGE_SIZE) | 242 | /* max. 16 clipping rectangles */ |
| 243 | #define SAA7146_CLIPPING_MEM (16 * 4 * sizeof(u32)) | ||
| 243 | 244 | ||
| 244 | /* some defines for the various clipping-modes */ | 245 | /* some defines for the various clipping-modes */ |
| 245 | #define SAA7146_CLIPPING_RECT 0x4 | 246 | #define SAA7146_CLIPPING_RECT 0x4 |