usb-gadget: reinforce error log in opening a gadget

Change-Id: I44aaa629e7592ccb9c982266b16f31b71d0210ec
Signed-off-by: Youngjae Cho <y0.cho@samsung.com>

diff --git a/src/usb-gadget/usb-gadget-cfs-gadget.c b/src/usb-gadget/usb-gadget-cfs-gadget.c
index 61583e0..c178c0f 100644 (file)
--- a/src/usb-gadget/usb-gadget-cfs-gadget.c
+++ b/src/usb-gadget/usb-gadget-cfs-gadget.c
@@ -550,23 +550,30 @@ static int usb_gadget_cfs_open(void)
        int ret;
 
        g_cfs_client = calloc(1, sizeof(*g_cfs_client));
-       if (!g_cfs_client)
+       if (!g_cfs_client) {
+               _E("Failed to alloc g_cfs_client.");
                return -ENOMEM;
+       }
 
        ret = usbg_init(CONFIGFS_PATH, &g_cfs_client->ctx);
-       if (ret)
+       if (ret) {
+               _E("Failed to usbg_init(), ret=%d", ret);
                goto err_usbg_init;
+       }
 
        g_cfs_client->udc = usbg_get_first_udc(g_cfs_client->ctx);
        if (!g_cfs_client->udc) {
+               _E("There is no availabe UDC.");
                ret = -ENODEV;
                goto err_no_udc;
        }
 
        ret = usbg_create_gadget(g_cfs_client->ctx, CONFIGFS_GADGET_NAME,
                                 &default_g_attrs, &default_g_strs, &g_cfs_client->gadget);
-       if (ret)
+       if (ret) {
+               _E("Failed to usbg_create_gadget(), ret=%d", ret);
                goto err_create_gadget;
+       }
 
        return 0;
 

diff --git a/src/usb-gadget/usb-gadget.c b/src/usb-gadget/usb-gadget.c
index efa1da8..59888ea 100644 (file)
--- a/src/usb-gadget/usb-gadget.c
+++ b/src/usb-gadget/usb-gadget.c
@@ -414,6 +414,8 @@ int usb_gadget_change_mode(unsigned int mode)
 
 int usb_gadget_init(void)
 {
+       int ret;
+
        if (usb_gadget_legacy_supported()) {
                /* legacy samsung gadget */
                usb_gadget_bind_legacy_gadget(&__usb_gadget_open,
@@ -434,7 +436,13 @@ int usb_gadget_init(void)
        }
 
        /* open supported usb-gadget */
-       __usb_gadget_open();
+       if (__usb_gadget_open) {
+               ret = __usb_gadget_open();
+               if (ret != 0) {
+                       CRITICAL_LOG("Failed to open usb-gadget, %d", ret);
+                       return ret;
+               }
+       }
 
        /* Use mtp-responder-dummy.socket when there is no mtp-responser.socket.
         *

diff --git a/src/usb-gadget/usb.c b/src/usb-gadget/usb.c
index c71da85..5c6ab63 100644 (file)
--- a/src/usb-gadget/usb.c
+++ b/src/usb-gadget/usb.c
@@ -287,7 +287,7 @@ static void usb_init(void *data)
 
        ret = usb_gadget_init();
        if (ret < 0) {
-               _E("USB client cannot be used: %d", ret);
+               CRITICAL_LOG("USB client cannot be used: %d", ret);
                return;
        }