On Fri, Jan 28, 2011 at 5:35 PM, Stefan Weil <weil at mail.berlios.de> wrote: > 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?
Yes, should be &&. Thanks, Reviewed-by: Alex Deucher <alexdeucher at gmail.com> > > It looks like cppcheck is correct, so fix this. No test was run. > > Cc: David Airlie <airlied at linux.ie> > Cc: Alex Deucher <alexdeucher at gmail.com> > Cc: dri-devel at lists.freedesktop.org > Cc: linux-kernel at vger.kernel.org > Signed-off-by: Stefan Weil <weil at mail.berlios.de> > --- > ?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 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; > > -- > 1.7.2.3 > >
