diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-07-25 17:55:52 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2007-07-25 17:55:52 +0200 |
| commit | f429aeb66e793e31f5782b9ace45de6d54a08344 (patch) | |
| tree | 53ded3a2128eaeff7df3fd13901524a1d7d30283 /linux/drivers/media/video/ivtv/ivtv-fileops.c | |
| parent | b63fc1f2e15fdcbb60351659913c5d697b62e053 (diff) | |
| download | mediapointer-dvb-s2-f429aeb66e793e31f5782b9ace45de6d54a08344.tar.gz mediapointer-dvb-s2-f429aeb66e793e31f5782b9ace45de6d54a08344.tar.bz2 | |
ivtv-fb: initializing the framebuffer should trigger ivtv firmware load
From: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-fileops.c')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-fileops.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-fileops.c b/linux/drivers/media/video/ivtv/ivtv-fileops.c index c7c1d3e59..0f14a790b 100644 --- a/linux/drivers/media/video/ivtv/ivtv-fileops.c +++ b/linux/drivers/media/video/ivtv/ivtv-fileops.c @@ -842,16 +842,12 @@ int ivtv_v4l2_open(struct inode *inode, struct file *filp) if (itv == NULL) { /* Couldn't find a device registered on that minor, shouldn't happen! */ - printk(KERN_WARNING "ivtv: No ivtv device found on minor %d\n", minor); + IVTV_WARN("No ivtv device found on minor %d\n", minor); return -ENXIO; } - if (!test_and_set_bit(IVTV_F_I_INITED, &itv->i_flags)) - if (ivtv_init_on_first_open(itv)) - set_bit(IVTV_F_I_FAILED, &itv->i_flags); - - if (test_bit(IVTV_F_I_FAILED, &itv->i_flags)) { - printk(KERN_WARNING "ivtv: failed to initialize on minor %d\n", minor); + if (ivtv_init_on_first_open(itv)) { + IVTV_ERR("Failed to initialize on minor %d\n", minor); return -ENXIO; } |