tests/func.sh: Fix some total breakage in the test scripts

[thirdparty/mdadm.git] / platform-intel.c

diff --git a/platform-intel.c b/platform-intel.c
index 7ad88315025a1f1acc428773769433593e00f282..a11101db3bfb7024466c2ff82310f1b1f215c1e3 100644 (file)
--- a/platform-intel.c
+++ b/platform-intel.c
@@ -187,6 +187,16 @@ struct sys_dev *device_by_id(__u16 device_id)
        return NULL;
 }
 
+struct sys_dev *device_by_id_and_path(__u16 device_id, const char *path)
+{
+       struct sys_dev *iter;
+
+       for (iter = intel_devices; iter != NULL; iter = iter->next)
+               if ((iter->dev_id == device_id) && strstr(iter->path, path))
+                       return iter;
+       return NULL;
+}
+
 static int devpath_to_ll(const char *dev_path, const char *entry, unsigned long long *val)
 {
        char path[strlen(dev_path) + strlen(entry) + 2];
@@ -538,8 +548,8 @@ static int read_efi_variable(void *buffer, ssize_t buf_size, char *variable_name
 
        errno = 0;
        var_data_len = strtoul(buf, NULL, 16);
-       if ((errno == ERANGE && (var_data_len == LONG_MAX))
-           || (errno != 0 && var_data_len == 0))
+       if ((errno == ERANGE && (var_data_len == LONG_MAX)) ||
+           (errno != 0 && var_data_len == 0))
                return 1;
 
        /* get data */