From db04f28177fd83d88533c8e83ef272310f531d0c Mon Sep 17 00:00:00 2001 From: Octavian Purdila Date: Fri, 15 Jul 2011 17:34:15 +0100 Subject: [PATCH] --- yaml --- r: 260061 b: refs/heads/master c: 6e4b308a286821458633a90b82d63d2ce7e742b5 h: refs/heads/master i: 260059: d5f3377faf0ab74af7e68d5329cbc5019185e449 v: v3 --- [refs] | 2 +- trunk/drivers/staging/gma500/psb_intel_lvds.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 021d243248af..b46f6dd47900 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 173b3de9a5817ec2c264eca1b8795c7dbda3c50e +refs/heads/master: 6e4b308a286821458633a90b82d63d2ce7e742b5 diff --git a/trunk/drivers/staging/gma500/psb_intel_lvds.c b/trunk/drivers/staging/gma500/psb_intel_lvds.c index da6f5c89e5e7..53803b25cadb 100644 --- a/trunk/drivers/staging/gma500/psb_intel_lvds.c +++ b/trunk/drivers/staging/gma500/psb_intel_lvds.c @@ -521,7 +521,8 @@ static int psb_intel_lvds_get_modes(struct drm_connector *connector) psb_intel_output->mode_dev; int ret = 0; - ret = psb_intel_ddc_get_modes(psb_intel_output); + if (!IS_MRST(dev)) + ret = psb_intel_ddc_get_modes(psb_intel_output); if (ret) return ret;