lkml.org 
[lkml]   [2008]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 22/22] sony-laptop: ignore missing _DIS method on pic device
    2.6.27-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Matthew Garrett <mjg59@srcf.ucam.org>

    commit 6158d3a2323835546c7cf83a170316fa77b726e0 upstream.

    At least the Vaio VGN-Z540N doesn't have this method, so let's not fail
    to suspend just because it doesn't exist.

    Signed-off-by: Adam Jackson <ajax@redhat.com>
    Acked-by: Mattia Dongili <malattia@linux.it>
    Cc: Len Brown <lenb@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Steve Conklin <sconklin@canonical.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>


    ---
    drivers/misc/sony-laptop.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    --- a/drivers/misc/sony-laptop.c
    +++ b/drivers/misc/sony-laptop.c
    @@ -2315,8 +2315,10 @@ end:
    */
    static int sony_pic_disable(struct acpi_device *device)
    {
    - if (ACPI_FAILURE(acpi_evaluate_object(device->handle,
    - "_DIS", NULL, NULL)))
    + acpi_status ret = acpi_evaluate_object(device->handle, "_DIS", NULL,
    + NULL);
    +
    + if (ACPI_FAILURE(ret) && ret != AE_NOT_FOUND)
    return -ENXIO;

    dprintk("Device disabled\n");
    --


    \
     
     \ /
      Last update: 2008-11-15 06:35    [W:0.028 / U:122.556 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site