summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDavid Sin <davidsin@ti.com>2009-11-23 17:11:33 -0600
committerSantosh Shilimkar <santosh.shilimkar@ti.com>2009-11-24 11:55:55 +0530
commitda275624682d45a28fdd8020f4095cd1d1e8913a (patch)
treec3f095d51b2e20da9c420e301b425ed927d7b2d2 /drivers
parent0453f4f7b85633b615314cdcfdd517dbaa36468a (diff)
remove workaround for tiler free race condition
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/omap/omap_vout.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c
index 9c34fcb8d7c4..60b32a0aab4a 100644
--- a/drivers/media/video/omap/omap_vout.c
+++ b/drivers/media/video/omap/omap_vout.c
@@ -122,7 +122,6 @@ static u32 vid1_static_vrfb_alloc;
static u32 vid2_static_vrfb_alloc;
static int debug;
-struct mutex my_lock;
/* Module parameters */
module_param(video1_numbuffers, uint, S_IRUGO);
MODULE_PARM_DESC(video1_numbuffers, "Number of buffers to be allocated at \
@@ -632,7 +631,6 @@ static int omap_vout_tiler_buffer_setup(struct omap_vout_device *vout,
static void omap_vout_free_tiler_buffers(struct omap_vout_device *vout)
{
int j;
- mutex_lock(&my_lock);
for (j = 0; j < vout->buffer_allocated; j++) {
tiler_free_buf(vout->buf_phy_addr[j]);
tiler_free_buf(vout->buf_phy_uv_addr[j]);
@@ -640,7 +638,6 @@ static void omap_vout_free_tiler_buffers(struct omap_vout_device *vout)
vout->buf_phy_uv_addr[j] = 0;
}
vout->buffer_allocated = 0;
- mutex_unlock(&my_lock);
}
#endif
@@ -3185,7 +3182,6 @@ static int __init omap_vout_init(void)
Video driver\n");
return -EINVAL;
}
- mutex_init(&my_lock);
return 0;
}