[PATCH 2/2] apple-gmux: obtain version information from indexed gmux

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

With the introduced read fixes, version information can be extracted
from the indexed gmux device.

> apple_gmux: Found gmux version 3.2.19 [indexed]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAlA3NlwACgkQ6iVUjPs37Jmr4wCfbG0eE8bZFsnZ8t9YxdOH5VII
OUsAn04UNm0uPrEMlSc5vFcOAcgNOAz0
=FObp
-----END PGP SIGNATURE-----
Signed-off-by: Bernhard Froemel <froemel@xxxxxxxxxxxxxxxxxx>
--- a/drivers/platform/x86/apple-gmux.c	2012-08-22 22:29:06.000000000 +0200
+++ b/drivers/platform/x86/apple-gmux.c	2012-08-24 09:18:50.229362622 +0200
@@ -461,18 +461,22 @@
 	ver_release = gmux_read8(gmux_data, GMUX_PORT_VERSION_RELEASE);
 	if (ver_major == 0xff && ver_minor == 0xff && ver_release == 0xff) {
 		if (gmux_is_indexed(gmux_data)) {
+			u32 version;
 			mutex_init(&gmux_data->index_lock);
 			gmux_data->indexed = true;
+			version = gmux_read32(gmux_data,
+				GMUX_PORT_VERSION_MAJOR);
+			ver_major = (version >> 24) & 0xff;
+			ver_minor = (version >> 16) & 0xff;
+			ver_release = (version >> 8) & 0xff;
 		} else {
 			pr_info("gmux device not present\n");
 			ret = -ENODEV;
 			goto err_release;
 		}
-		pr_info("Found indexed gmux\n");
-	} else {
-		pr_info("Found gmux version %d.%d.%d\n", ver_major, ver_minor,
-			ver_release);
 	}
+	pr_info("Found gmux version %d.%d.%d [%s]\n", ver_major, ver_minor,
+		ver_release, (gmux_data->indexed ? "indexed" : "classic"));
 
 	memset(&props, 0, sizeof(props));
 	props.type = BACKLIGHT_PLATFORM;

Attachment: 02_indexed_interface_obtain_version_info.txt.sig
Description: Binary data


[Index of Archives]     [Linux Kernel Development]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux