diff options
| author | Stefan Weil <weil@mail.berlios.de> | 2011-01-28 23:35:18 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-01-31 00:58:35 +0100 |
| commit | e468e0017b656841b661e57a948c3b858d58b959 (patch) | |
| tree | dc4cccb6ab68d778b92ca3d3b6313dad35eb9374 /drivers | |
| parent | Merge branch 'stable/bug-fixes-rc2' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| download | linux-e468e0017b656841b661e57a948c3b858d58b959.tar.xz linux-e468e0017b656841b661e57a948c3b858d58b959.zip | |
drm/radeon: Fix wrong boolean operator
This error is reported by cppcheck:
drivers/gpu/drm/radeon/radeon_encoders.c:1066: warning: Mutual exclusion over || always evaluates to true. Did you intend to use && instead?
It looks like cppcheck is correct, so fix this. No test was run.
Cc: David Airlie <airlied@linux.ie>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Cc: dri-devel@lists.freedesktop.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_encoders.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c index 5e90984d5ad2..d4a542247618 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; |