From 1b5ec7f7f16b197f09d89e012daa1d1db8785afa Mon Sep 17 00:00:00 2001 From: Yasuaki Ishimatsu Date: Fri, 1 Feb 2013 10:14:20 +0900 Subject: [PATCH] --- yaml --- r: 358082 b: refs/heads/master c: 7d37beaaf3dbc6ff16f4d32a4dd6f8c557c6ab50 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_opregion.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f0b54dd01549..16e49c9ce0f2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 209d52110a32c2069b5d870504e73fdb0e30fc51 +refs/heads/master: 7d37beaaf3dbc6ff16f4d32a4dd6f8c557c6ab50 diff --git a/trunk/drivers/gpu/drm/i915/intel_opregion.c b/trunk/drivers/gpu/drm/i915/intel_opregion.c index 7741c22c934c..4d338740f2cb 100644 --- a/trunk/drivers/gpu/drm/i915/intel_opregion.c +++ b/trunk/drivers/gpu/drm/i915/intel_opregion.c @@ -347,7 +347,7 @@ static void intel_didl_outputs(struct drm_device *dev) int i = 0; handle = DEVICE_ACPI_HANDLE(&dev->pdev->dev); - if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) + if (!handle || acpi_bus_get_device(handle, &acpi_dev)) return; if (acpi_is_video_device(acpi_dev))