2 files changed, 13 insertions, 4 deletions

diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index 0aedbeaf94c..f12733d6bf7 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);
+                core->active_ref++;
+                mutex_lock(&drv->core->lock);
+                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,10 +634,12 @@ static int cx8802_request_release(struct cx8802_driver *drv)
 {
         struct cx88_core *core = drv->core;
 
-        if (drv->advise_release)
+        if (drv->advise_release && --core->active_ref == 0)
         {
+                mutex_lock(&drv->core->lock);
                 drv->advise_release(drv);
                 core->active_type_id = CX88_BOARD_NONE;
+                mutex_unlock(&drv->core->lock);
                 mpeg_dbg(1,"%s() Post release GPIO=%x\n", __FUNCTION__, cx_read(MO_GP0_IO));
         }
 
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 4e823f2a539..37e6d2e4002 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -336,6 +336,7 @@ struct cx88_core {
         /* cx88-video needs to access cx8802 for hybrid tuner pll access. */
         struct cx8802_dev          *dvbdev;
         enum cx88_board_type       active_type_id;
+        int                        active_ref;
 };
 
 struct cx8800_dev;