1 files changed, 12 insertions, 4 deletions

diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index 0aedbeaf94cd..e357f415db06 100644
--- a/drivers/media/video/cx88/cx88-mpeg.c
+++ b/drivers/media/video/cx88/cx88-mpeg.c
@@ -609,13 +609,19 @@ static int cx8802_request_acquire(struct cx8802_driver *drv)
         struct cx88_core *core = drv->core;
 
         /* Fail a request for hardware if the device is busy. */
-        if (core->active_type_id != CX88_BOARD_NONE)
+        if (core->active_type_id != CX88_BOARD_NONE &&
+            core->active_type_id != drv->type_id)
                 return -EBUSY;
 
         if (drv->advise_acquire)
         {
-                core->active_type_id = drv->type_id;
-                drv->advise_acquire(drv);
+                mutex_lock(&drv->core->lock);
+                core->active_ref++;
+                if (core->active_type_id == CX88_BOARD_NONE) {
+                        core->active_type_id = drv->type_id;
+                        drv->advise_acquire(drv);
+                }
+                mutex_unlock(&drv->core->lock);
 
                 mpeg_dbg(1,"%s() Post acquire GPIO=%x\n", __FUNCTION__, cx_read(MO_GP0_IO));
         }
@@ -628,12 +634,14 @@ static int cx8802_request_release(struct cx8802_driver *drv)
 {
         struct cx88_core *core = drv->core;
 
-        if (drv->advise_release)
+        mutex_lock(&drv->core->lock);
+        if (drv->advise_release && --core->active_ref == 0)
         {
                 drv->advise_release(drv);
                 core->active_type_id = CX88_BOARD_NONE;
                 mpeg_dbg(1,"%s() Post release GPIO=%x\n", __FUNCTION__, cx_read(MO_GP0_IO));
         }
+        mutex_unlock(&drv->core->lock);
 
         return 0;
 }