aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/platform/x86/apple-gmux.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/platform/x86/apple-gmux.c b/drivers/platform/x86/apple-gmux.c
index dfb1a92ce949..c9558d1ea88c 100644
--- a/drivers/platform/x86/apple-gmux.c
+++ b/drivers/platform/x86/apple-gmux.c
@@ -461,18 +461,22 @@ static int __devinit gmux_probe(struct pnp_dev *pnp,
461 ver_release = gmux_read8(gmux_data, GMUX_PORT_VERSION_RELEASE); 461 ver_release = gmux_read8(gmux_data, GMUX_PORT_VERSION_RELEASE);
462 if (ver_major == 0xff && ver_minor == 0xff && ver_release == 0xff) { 462 if (ver_major == 0xff && ver_minor == 0xff && ver_release == 0xff) {
463 if (gmux_is_indexed(gmux_data)) { 463 if (gmux_is_indexed(gmux_data)) {
464 u32 version;
464 mutex_init(&gmux_data->index_lock); 465 mutex_init(&gmux_data->index_lock);
465 gmux_data->indexed = true; 466 gmux_data->indexed = true;
467 version = gmux_read32(gmux_data,
468 GMUX_PORT_VERSION_MAJOR);
469 ver_major = (version >> 24) & 0xff;
470 ver_minor = (version >> 16) & 0xff;
471 ver_release = (version >> 8) & 0xff;
466 } else { 472 } else {
467 pr_info("gmux device not present\n"); 473 pr_info("gmux device not present\n");
468 ret = -ENODEV; 474 ret = -ENODEV;
469 goto err_release; 475 goto err_release;
470 } 476 }
471 pr_info("Found indexed gmux\n");
472 } else {
473 pr_info("Found gmux version %d.%d.%d\n", ver_major, ver_minor,
474 ver_release);
475 } 477 }
478 pr_info("Found gmux version %d.%d.%d [%s]\n", ver_major, ver_minor,
479 ver_release, (gmux_data->indexed ? "indexed" : "classic"));
476 480
477 memset(&props, 0, sizeof(props)); 481 memset(&props, 0, sizeof(props));
478 props.type = BACKLIGHT_PLATFORM; 482 props.type = BACKLIGHT_PLATFORM;