diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-29 10:06:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-29 10:06:41 -0800 |
| commit | 4945b8a553ec735f416596cbf5789c439d16fb38 (patch) | |
| tree | c159093b9d7ae9395dcca30ebda0e8dc8284e4a6 /drivers/media/video/cafe_ccic.c | |
| parent | 6c722e90d7ede7db2d2b28a3cc69a8545db67ea1 (diff) | |
| parent | 69f7e75a9d45e5eaca16917a8d0dedf76149f13f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (28 commits)
V4L/DVB (5010): Cx88: Fix leadtek_eeprom tagging
V4L/DVB (5012): Usbvision fix: It was using "&&" instead "&"
V4L/DVB (5001): Add two required headers on kernel 2.6.20-rc1
V4L/DVB (5014): Allyesconfig build fixes on some non x86 arch
V4L/DVB (4997): Bttv: delete duplicated ioremap()
V4L/DVB (4996): Msp3400: fix kthread_run error check
V4L/DVB (4995): Vivi: fix kthread_run() error check
V4L/DVB (4994): Vivi: fix use after free in list_for_each()
V4L/DVB (4992): Fix typo in saa7134-dvb.c
V4L/DVB (4991): Cafe_ccic.c: fix NULL dereference
V4L/DVB (4990): Cpia2/cpia2_usb.c: fix error-path leak
V4L/DVB (4988): Cx2341x audio_properties is an u16, not u8
V4L/DVB (4984): LOG_STATUS should show the real temporal filter value.
V4L/DVB (4983): Force temporal filter to 0 when scaling to prevent ghosting.
V4L/DVB (4982): Fix broken audio mode handling for line-in in msp3400.
V4L/DVB (4980): Fixes bug 7267: PAL/60 is not working
V4L/DVB (4979): Fixes compilation when CONFIG_V4L1_COMPAT is not selected
V4L/DVB (4973): Dvb-core: fix printk type warning
V4L/DVB (4972): Dvb-core: fix bug in CRC-32 checking on 64-bit systems
V4L/DVB (4970): Usbvision memory fixes
...
Diffstat (limited to 'drivers/media/video/cafe_ccic.c')
| -rw-r--r-- | drivers/media/video/cafe_ccic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c index e347c7ebc98..3083c8075d1 100644 --- a/drivers/media/video/cafe_ccic.c +++ b/drivers/media/video/cafe_ccic.c @@ -2166,7 +2166,7 @@ static void cafe_pci_remove(struct pci_dev *pdev) struct cafe_camera *cam = cafe_find_by_pdev(pdev); if (cam == NULL) { - cam_warn(cam, "pci_remove on unknown pdev %p\n", pdev); + printk(KERN_WARNING "pci_remove on unknown pdev %p\n", pdev); return; } mutex_lock(&cam->s_mutex); |