openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

V4L/DVB (6115): ivtv/ivtv-fb: improve locking to avoid initialization problems 

ivtv/ivtv-fb: improve locking to prevent ivtv/ivtv-fb initialization problems

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Hans Verkuil 2007-08-25 05:41:52 -03:00 committed by Mauro Carvalho Chehab
parent 49ebf14e24
commit 26e9d59956
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/video/ivtv/ivtv-driver.c
View File

@ -1003,6 +1003,8 @@ static int __devinit ivtv_probe(struct pci_dev *dev,
IVTV_DEBUG_INFO("base addr: 0x%08x\n", itv->base_addr); IVTV_DEBUG_INFO("base addr: 0x%08x\n", itv->base_addr);
mutex_lock(&itv->serialize_lock);
/* PCI Device Setup */ /* PCI Device Setup */
if ((retval = ivtv_setup_pci(itv, dev, pci_id)) != 0) { if ((retval = ivtv_setup_pci(itv, dev, pci_id)) != 0) {
if (retval == -EIO) if (retval == -EIO)
@ -1174,6 +1176,7 @@ static int __devinit ivtv_probe(struct pci_dev *dev,
IVTV_ERR("Failed to register irq %d\n", retval); IVTV_ERR("Failed to register irq %d\n", retval);
goto free_streams; goto free_streams;
} }
mutex_unlock(&itv->serialize_lock);
IVTV_INFO("Initialized card #%d: %s\n", itv->num, itv->card_name); IVTV_INFO("Initialized card #%d: %s\n", itv->num, itv->card_name);
return 0; return 0;
@ -1192,6 +1195,7 @@ static int __devinit ivtv_probe(struct pci_dev *dev,
release_mem_region(itv->base_addr + IVTV_DECODER_OFFSET, IVTV_DECODER_SIZE); release_mem_region(itv->base_addr + IVTV_DECODER_OFFSET, IVTV_DECODER_SIZE);
free_workqueue: free_workqueue:
destroy_workqueue(itv->irq_work_queues); destroy_workqueue(itv->irq_work_queues);
mutex_unlock(&itv->serialize_lock);
err: err:
if (retval == 0) if (retval == 0)
retval = -ENODEV; retval = -ENODEV;

3
drivers/media/video/ivtv/ivtv-fb.c
View File

@ -1011,10 +1011,13 @@ static int ivtvfb_init_io(struct ivtv *itv)
{ {
struct osd_info *oi = itv->osd_info; struct osd_info *oi = itv->osd_info;
mutex_lock(&itv->serialize_lock);
if (ivtv_init_on_first_open(itv)) { if (ivtv_init_on_first_open(itv)) {
mutex_unlock(&itv->serialize_lock);
IVTV_FB_ERR("Failed to initialize ivtv\n"); IVTV_FB_ERR("Failed to initialize ivtv\n");
return -ENXIO; return -ENXIO;
} }
mutex_unlock(&itv->serialize_lock);
ivtv_fb_get_framebuffer(itv, &oi->video_rbase, &oi->video_buffer_size); ivtv_fb_get_framebuffer(itv, &oi->video_rbase, &oi->video_buffer_size);