From patchwork Fri Jan 28 22:35:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 516081 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0SMnKOM010880 for ; Fri, 28 Jan 2011 22:49:41 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 990B99ED4B for ; Fri, 28 Jan 2011 14:49:19 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 28 Jan 2011 22:50:04 +0000 (UTC) X-Greylist: delayed 333 seconds by postgrey-1.31 at gabe; Fri, 28 Jan 2011 14:41:08 PST Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.17.8]) by gabe.freedesktop.org (Postfix) with ESMTP id BA35D9E740 for ; Fri, 28 Jan 2011 14:41:08 -0800 (PST) Received: from flocke.fritz.box (p5086F4EF.dip.t-dialin.net [80.134.244.239]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0Mgrky-1PVhNk3NOy-00Mk5w; Fri, 28 Jan 2011 23:35:32 +0100 Received: from stefan by flocke.fritz.box with local (Exim 4.72) (envelope-from ) id 1Piwuh-000232-S3; Fri, 28 Jan 2011 23:35:31 +0100 From: Stefan Weil To: David Airlie Subject: [PATCH] radeon: Fix wrong boolean operator Date: Fri, 28 Jan 2011 23:35:18 +0100 Message-Id: <1296254118-7845-1-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.7.2.3 X-Provags-ID: V02:K0:nj3/w7O6x6rA6g3ImYJ7FmB95qqW3/bItCDn1fRqKeo qbBGL+DmPJKAiGP5/+mr9sIApxIgXfNP/hEVnTLKut8GwHfw1h /76Fjcpho1wI02t+7iM6maSxhAnp9C03ATuprO+LQcG8ri61ee AffrNX+tIkRhwdNfu5xs8BsUBhH4to7lvlbFT88xDgCVfmnKFN SEtGi9VF0b94B6RKjcUa3miXYSwd5fsvkwc7WF6TbUI2pQX/ZO UE+Gik4QrRCPs X-Mailman-Approved-At: Fri, 28 Jan 2011 14:49:09 -0800 Cc: Stefan Weil , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c index 5e90984..d4a5422 100644 --- a/drivers/gpu/drm/radeon/radeon_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_encoders.c @@ -1063,7 +1063,7 @@ atombios_set_edp_panel_power(struct drm_connector *connector, int action) if (!ASIC_IS_DCE4(rdev)) return; - if ((action != ATOM_TRANSMITTER_ACTION_POWER_ON) || + if ((action != ATOM_TRANSMITTER_ACTION_POWER_ON) && (action != ATOM_TRANSMITTER_ACTION_POWER_OFF)) return;