lkml.org 
[lkml]   [2012]   [Jun]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 36/42] acpi_video: fix leaking PCI references
    3.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Alan Cox <alan@linux.intel.com>

    commit cfb46f433a4da97c31780e08a259fac2cb6bd61f upstream.

    Signed-off-by: Alan Cox <alan@linux.intel.com>
    Acked-by: Matthew Garrett <mjg@redhat.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/acpi/video.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- a/drivers/acpi/video.c
    +++ b/drivers/acpi/video.c
    @@ -1745,6 +1745,7 @@ static int acpi_video_bus_remove(struct

    static int __init intel_opregion_present(void)
    {
    + int i915 = 0;
    #if defined(CONFIG_DRM_I915) || defined(CONFIG_DRM_I915_MODULE)
    struct pci_dev *dev = NULL;
    u32 address;
    @@ -1757,10 +1758,10 @@ static int __init intel_opregion_present
    pci_read_config_dword(dev, 0xfc, &address);
    if (!address)
    continue;
    - return 1;
    + i915 = 1;
    }
    #endif
    - return 0;
    + return i915;
    }

    int acpi_video_register(void)



    \
     
     \ /
      Last update: 2012-06-15 03:01    [W:0.021 / U:120.404 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site