Fix device addition 22/282022/1
authorAbhay Agarwal <ay.agarwal@samsung.com>
Tue, 20 Sep 2022 09:17:47 +0000 (14:47 +0530)
committerAbhay Agarwal <ay.agarwal@samsung.com>
Mon, 26 Sep 2022 08:58:10 +0000 (14:28 +0530)
Change-Id: I568933e3860c8b82c578c28fb183541b42834bf8
Signed-off-by: Abhay Agarwal <ay.agarwal@samsung.com>
ua-daemon/src/pm/ua-plugin-manager.c

index d65f5952483e0090c9955370ac7a6505d3138105..ad51b501c0dfc047f97c6c76d4e8476c22f9f6d7 100644 (file)
@@ -415,7 +415,7 @@ gboolean _uam_pm_is_sensor_ready(unsigned int sensor_bitmask)
 }
 
 static int __uam_pm_set_dev_info(int user_id, const uam_device_info_s *dev,
-               uam_sensor_plugin_info_t *plugin, uas_device_info_t *device)
+               uam_sensor_plugin_info_t **plugin, uas_device_info_t **device)
 {
        retv_if(NULL == dev, UAM_ERROR_INVALID_PARAMETER);
 
@@ -423,18 +423,18 @@ static int __uam_pm_set_dev_info(int user_id, const uam_device_info_s *dev,
        UAM_DBG("Plugin id: %d", id);
        retv_if(UAS_PLUGIN_ID_MAX <= id, UAM_ERROR_INVALID_PARAMETER);
 
-       plugin = plugins[id];
-       retv_if(!plugin || !plugin->api, UAM_ERROR_NOT_SUPPORTED);
-       retv_if(UAS_SUPPORT_USER != plugin->capability, UAM_ERROR_NOT_SUPPORTED);
+       *plugin = plugins[id];
+       retv_if(!(*plugin) || !(*plugin)->api, UAM_ERROR_NOT_SUPPORTED);
+       retv_if(UAS_SUPPORT_USER != (*plugin)->capability, UAM_ERROR_NOT_SUPPORTED);
 
-       if (plugin->module)
+       if ((*plugin)->module)
                UAM_DBG("Register device MAC: [%s] for user-id[%d] on [%s]",
-                       dev->mac, user_id, plugin->module->name);
+                       dev->mac, user_id, (*plugin)->module->name);
 
-       device = _pm_util_uam_dev_info_to_uas_dev_info(dev);
-       retv_if(NULL == device, UAM_ERROR_INTERNAL);
+       *device = _pm_util_uam_dev_info_to_uas_dev_info(dev);
+       retv_if(NULL == *device, UAM_ERROR_INTERNAL);
 
-       device->user_id = user_id;
+       (*device)->user_id = user_id;
 
        return UAM_ERROR_NONE;
 }
@@ -447,7 +447,7 @@ int _uam_pm_register_device(int user_id, const uam_device_info_s *dev)
        uam_sensor_plugin_info_t *plugin = NULL;
        uas_device_info_t *device = NULL;
 
-       ret = __uam_pm_set_dev_info(user_id, dev, plugin, device);
+       ret = __uam_pm_set_dev_info(user_id, dev, &plugin, &device);
        retv_if(ret != UAM_ERROR_NONE, ret);
        retv_if(!plugin || !plugin->api, UAM_ERROR_NOT_SUPPORTED);
 
@@ -471,7 +471,7 @@ int _uam_pm_unregister_device(int user_id, const uam_device_info_s *dev)
 
        retv_if(NULL == dev, UAM_ERROR_INVALID_PARAMETER);
 
-       ret = __uam_pm_set_dev_info(user_id, dev, plugin, device);
+       ret = __uam_pm_set_dev_info(user_id, dev, &plugin, &device);
        retv_if(ret != UAM_ERROR_NONE, ret);
        retv_if(!plugin || !plugin->api, UAM_ERROR_NOT_SUPPORTED);