summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-10-26 17:14:36 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2010-10-27 08:53:28 +0100
commitdd2b379f071424f36f9f90ff83cb4ad058c7b6ed (patch)
treec85bb5c756a36156da7e51683fe6248cfee3ea15
parent12ba8d1e9262ce81a695795410bd9ee5c9407ba1 (diff)
downloadblackbird-op-linux-dd2b379f071424f36f9f90ff83cb4ad058c7b6ed.tar.gz
blackbird-op-linux-dd2b379f071424f36f9f90ff83cb4ad058c7b6ed.zip
drm/i915: Fix typo from "Enable DisplayPort Audio"
Hi, while I looked through your changes in drm-intel git tree (as I've got a pressure for supporting DisplayPort audio), I stumbled on the possible bug in the commit a9756bb5b25d5d997df0c5d8c95db01292191bea Author: Zhenyu Wang <zhenyuw@linux.intel.com> Date: Sun Sep 19 13:09:06 2010 +0800 drm/i915: Enable DisplayPort audio In this commit, you changed the return value of g4x_dp_detect() to "bit", but it should be "status", I suppose. [ickle: mea culpa.] Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=31094 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--drivers/gpu/drm/i915/intel_dp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 891f4f1d63b1..c8e005553310 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1517,7 +1517,7 @@ g4x_dp_detect(struct intel_dp *intel_dp)
status = connector_status_connected;
}
- return bit;
+ return status;
}
/**
OpenPOWER on IntegriCloud