[Release version 0.10.69] Fix realize failure - delete murphy resource set before...

Change-Id: Ie726b3b60fb65e2ce2d5c3df65f278b387676891
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/packaging/libmm-camcorder.spec b/packaging/libmm-camcorder.spec
index d5349a6..1825aa0 100644 (file)
--- a/packaging/libmm-camcorder.spec
+++ b/packaging/libmm-camcorder.spec
@@ -1,6 +1,6 @@
 Name:       libmm-camcorder
 Summary:    Camera and recorder library
-Version:    0.10.68
+Version:    0.10.69
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0

diff --git a/src/mm_camcorder_internal.c b/src/mm_camcorder_internal.c
index 34d8e66..9558219 100644 (file)
--- a/src/mm_camcorder_internal.c
+++ b/src/mm_camcorder_internal.c
@@ -535,11 +535,6 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info)
                }
        }
 
-       ret = _mmcamcorder_resource_create_resource_set(&hcamcorder->resource_manager);
-       if (ret != MM_ERROR_NONE) {
-               goto _ERR_DEFAULT_VALUE_INIT;
-       }
-
        _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
 #endif /* _MMCAMCORDER_MURPHY_SUPPORT */
 
@@ -1155,6 +1150,11 @@ int _mmcamcorder_realize(MMHandleType handle)
                        _mmcam_dbg_warn("NULL dpm_policy");
                }
 #ifdef _MMCAMCORDER_MURPHY_SUPPORT
+               ret = _mmcamcorder_resource_create_resource_set(&hcamcorder->resource_manager);
+               if (ret != MM_ERROR_NONE) {
+                       goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
+               }
+
                hcamcorder->resource_manager.acquire_count = 0;
 
                /* prepare resource manager for camera */

diff --git a/src/mm_camcorder_resource.c b/src/mm_camcorder_resource.c
index baea539..3c15e0a 100644 (file)
--- a/src/mm_camcorder_resource.c
+++ b/src/mm_camcorder_resource.c
@@ -257,8 +257,9 @@ static void __mmcamcorder_resource_release_cb(mrp_res_context_t *cx, const mrp_r
 int _mmcamcorder_resource_create_resource_set(MMCamcorderResourceManager *resource_manager)
 {
        if (resource_manager->rset) {
-               _mmcam_dbg_err(" - resource set was already created");
-               return MM_ERROR_RESOURCE_INVALID_STATE;
+               _mmcam_dbg_warn(" - resource set was already created, delete it");
+               mrp_res_delete_resource_set(resource_manager->rset);
+               resource_manager->rset = NULL;
        }
 
        resource_manager->rset = mrp_res_create_resource_set(resource_manager->context,