pio: don't close fd if it's value is negative

Additionaly return if fd open failed.

Change-Id: Ica183a00a265a499eb2e09a864062877ef8847fa
Signed-off-by: Konrad Kuchciak <k.kuchciak@samsung.com>

diff --git a/src/interface/peripheral_interface_adc.c b/src/interface/peripheral_interface_adc.c
index a65a982136bc7a7e32a1cdddf67f172d36c26730..623ed7453d49835f877b4b7ec7373d642565b573 100644 (file)
--- a/src/interface/peripheral_interface_adc.c
+++ b/src/interface/peripheral_interface_adc.c
@@ -51,6 +51,7 @@ int peripheral_interface_adc_fd_list_create(int device, int channel, GUnixFDList
        ret = __peripheral_interface_adc_fd_open(device, channel, &fd);
        if (ret != PERIPHERAL_ERROR_NONE) {
                _E("Failed to open adc fd");
+               goto out;
        }
 
        list = g_unix_fd_list_new();
@@ -66,7 +67,8 @@ int peripheral_interface_adc_fd_list_create(int device, int channel, GUnixFDList
        *list_out = list;
 
 out:
-       close(fd);
+       if (fd >= 0)
+               close(fd);
 
        return ret;
 }

diff --git a/src/interface/peripheral_interface_i2c.c b/src/interface/peripheral_interface_i2c.c
index 4a06dbc65656d9c19b3e76325f514d89f6cd1e64..efcb32b46dd3715eb1f76b96afe4a7a3c3afda75 100644 (file)
--- a/src/interface/peripheral_interface_i2c.c
+++ b/src/interface/peripheral_interface_i2c.c
@@ -57,6 +57,7 @@ int peripheral_interface_i2c_fd_list_create(int bus, int address, GUnixFDList **
        ret = __peripheral_interface_i2c_fd_open(bus, address, &fd);
        if (ret != PERIPHERAL_ERROR_NONE) {
                _E("Failed to open i2c fd");
+               goto out;
        }
 
        list = g_unix_fd_list_new();
@@ -72,7 +73,8 @@ int peripheral_interface_i2c_fd_list_create(int bus, int address, GUnixFDList **
        *list_out = list;
 
 out:
-       close(fd);
+       if (fd >= 0)
+               close(fd);
 
        return ret;
 }

diff --git a/src/interface/peripheral_interface_spi.c b/src/interface/peripheral_interface_spi.c
index 16fea9b949e6b2af28548c7afc7ba8288e65d2b0..c24d04be7a9f2742704ed8a372db8736b8067af9 100644 (file)
--- a/src/interface/peripheral_interface_spi.c
+++ b/src/interface/peripheral_interface_spi.c
@@ -50,6 +50,7 @@ int peripheral_interface_spi_fd_list_create(int bus, int cs, GUnixFDList **list_
        ret = __peripheral_interface_spi_fd_open(bus, cs, &fd);
        if (ret != PERIPHERAL_ERROR_NONE) {
                _E("Failed to open spi fd");
+               goto out;
        }
 
        list = g_unix_fd_list_new();
@@ -65,7 +66,8 @@ int peripheral_interface_spi_fd_list_create(int bus, int cs, GUnixFDList **list_
        *list_out = list;
 
 out:
-       close(fd);
+       if (fd >= 0)
+               close(fd);
 
        return ret;
 }

diff --git a/src/interface/peripheral_interface_uart.c b/src/interface/peripheral_interface_uart.c
index cdfe167f1adb3f0fa9efee950bc8637891b28eba..f650b42b3755e34582a47ac01c015771112c7925 100644 (file)
--- a/src/interface/peripheral_interface_uart.c
+++ b/src/interface/peripheral_interface_uart.c
@@ -65,6 +65,7 @@ int peripheral_interface_uart_fd_list_create(int port, GUnixFDList **list_out)
        ret = __peripheral_interface_uart_fd_open(port, &fd);
        if (ret != PERIPHERAL_ERROR_NONE) {
                _E("Failed to open uart fd");
+               goto out;
        }
 
        list = g_unix_fd_list_new();
@@ -80,7 +81,8 @@ int peripheral_interface_uart_fd_list_create(int port, GUnixFDList **list_out)
        *list_out = list;
 
 out:
-       close(fd);
+       if (fd >= 0)
+               close(fd);
 
        return ret;
 }