lkml.org 
[lkml]   [2012]   [Aug]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 2/2] apple-gmux: Obtain version info from indexed gmux
    Date
    From: Bernhard Froemel <froemel@vmars.tuwien.ac.at>

    This patch extracts and displays version information from the indexed
    gmux device as it is also done for the classic gmux device.

    Signed-off-by: Bernhard Froemel <froemel@vmars.tuwien.ac.at>
    ---
    drivers/platform/x86/apple-gmux.c | 12 ++++++++----
    1 file changed, 8 insertions(+), 4 deletions(-)

    diff --git a/drivers/platform/x86/apple-gmux.c b/drivers/platform/x86/apple-gmux.c
    index c38538e..0e43477 100644
    --- a/drivers/platform/x86/apple-gmux.c
    +++ b/drivers/platform/x86/apple-gmux.c
    @@ -463,18 +463,22 @@ static int __devinit gmux_probe(struct pnp_dev *pnp,
    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;
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2012-08-25 11:01    [W:0.022 / U:67.080 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site