diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-14 13:59:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-14 13:59:05 -0700 |
| commit | 44e3ff32ac229a10a30b7b840f092f5b32a5f72a (patch) | |
| tree | a219aced0374eda136b937b2c3f807464a346d92 /drivers/media/video/pwc/pwc-if.c | |
| parent | 7a1fa065a0264f6b3d3003ba5635289f6583c478 (diff) | |
| parent | e90ff9239e7636a191a8998a70cea220a2c58cdf (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
V4L/DVB (6220a): fix build error for et61x251 driver
V4L/DVB (6188): Avoid a NULL pointer dereference during mpeg_open()
V4L/DVB (6173a): Documentation: Remove reference to dead "cpia_pp=" boot-time option
V4L/DVB (6148): Fix a warning at saa7191_probe
V4L/DVB (6147): Pwc: Fix a broken debug message
V4L/DVB (6144): Fix mux setup for composite sound on AverTV 307
V4L/DVB (6095): ivtv: fix VIDIOC_G_ENC_INDEX flag handling
Diffstat (limited to 'drivers/media/video/pwc/pwc-if.c')
| -rw-r--r-- | drivers/media/video/pwc/pwc-if.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c index 3d81966d8c42..931b274bffca 100644 --- a/drivers/media/video/pwc/pwc-if.c +++ b/drivers/media/video/pwc/pwc-if.c @@ -1243,7 +1243,7 @@ static int pwc_video_close(struct inode *inode, struct file *file) PWC_ERROR("Failed to power down camera (%d)\n", i); } pdev->vopen--; - PWC_DEBUG_OPEN("<< video_close() vopen=%d\n", i); + PWC_DEBUG_OPEN("<< video_close() vopen=%d\n", pdev->vopen); } else { pwc_cleanup(pdev); /* Free memory (don't set pdev to 0 just yet) */ |