Merge branch 'exec_rm_compat' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg...

[pandora-kernel.git] / drivers / firmware / edd.c

diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
index 96c25d9..f1b7f65 100644 (file)
--- a/drivers/firmware/edd.c
+++ b/drivers/firmware/edd.c
@@ -531,8 +531,8 @@ static int
 edd_has_edd30(struct edd_device *edev)
 {
        struct edd_info *info;
-       int i, nonzero_path = 0;
-       char c;
+       int i;
+       u8 csum = 0;
 
        if (!edev)
                return 0;
@@ -544,16 +544,16 @@ edd_has_edd30(struct edd_device *edev)
                return 0;
        }
 
-       for (i = 30; i <= 73; i++) {
-               c = *(((uint8_t *) info) + i + 4);
-               if (c) {
-                       nonzero_path++;
-                       break;
-               }
-       }
-       if (!nonzero_path) {
+
+       /* We support only T13 spec */
+       if (info->params.device_path_info_length != 44)
+               return 0;
+
+       for (i = 30; i < info->params.device_path_info_length + 30; i++)
+               csum += *(((u8 *)&info->params) + i);
+
+       if (csum)
                return 0;
-       }
 
        return 1;
 }