Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26e9d599 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

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: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 49ebf14e

drivers/media/video/ivtv/ivtv-driver.c

+4 −0
Original line number Diff line number Diff line
@@ -1003,6 +1003,8 @@ static int __devinit ivtv_probe(struct pci_dev *dev, 


	IVTV_DEBUG_INFO("base addr: 0x%08x\n", itv->base_addr);



	mutex_lock(&itv->serialize_lock);



	/* PCI Device Setup */

	if ((retval = ivtv_setup_pci(itv, dev, pci_id)) != 0) {

		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);

		goto free_streams;

	}

	mutex_unlock(&itv->serialize_lock);

	IVTV_INFO("Initialized card #%d: %s\n", itv->num, itv->card_name);

	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);

      free_workqueue:

	destroy_workqueue(itv->irq_work_queues);

	mutex_unlock(&itv->serialize_lock);

      err:

	if (retval == 0)

		retval = -ENODEV;

drivers/media/video/ivtv/ivtv-fb.c

+3 −0
Original line number Diff line number Diff line
@@ -1011,10 +1011,13 @@ static int ivtvfb_init_io(struct ivtv *itv) 
{

	struct osd_info *oi = itv->osd_info;



	mutex_lock(&itv->serialize_lock);

	if (ivtv_init_on_first_open(itv)) {

		mutex_unlock(&itv->serialize_lock);

		IVTV_FB_ERR("Failed to initialize ivtv\n");

		return -ENXIO;

	}

	mutex_unlock(&itv->serialize_lock);



	ivtv_fb_get_framebuffer(itv, &oi->video_rbase, &oi->video_buffer_size);