---

yaml --- r: 65812 b: refs/heads/master c: 26e9d59 h: refs/heads/master v: v3
git-mirror · Oct 10, 2007 · f6f34f9 · f6f34f9
1 parent 885d317
commit f6f34f9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49ebf14e249734a5f64d5bdd9aaa2ddf4bcedc51
+refs/heads/master: 26e9d599561e9a964bd4d7c2be0029db8aaff852
diff --git a/trunk/drivers/media/video/ivtv/ivtv-driver.c b/trunk/drivers/media/video/ivtv/ivtv-driver.c
@@ -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;

diff --git a/trunk/drivers/media/video/ivtv/ivtv-fb.c b/trunk/drivers/media/video/ivtv/ivtv-fb.c
@@ -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);