[PATCH] drm/radeon: fix logic error in atombios_encoders.c

[Michel Dänzer]

On Mit, 2012-11-14 at 09:13 -0500, alexdeucher at gmail.com wrote: 
> From: Alex Deucher <alexander.deucher at amd.com>
> 
> Fixes:
> https://bugzilla.kernel.org/show_bug.cgi?id=50431
> 
> Reported-by: David Binderman <dcb314 at hotmail.com>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> Cc: stable at vger.kernel.org

Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>


>  drivers/gpu/drm/radeon/atombios_encoders.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c
> index ba498f8..010bae1 100644
> --- a/drivers/gpu/drm/radeon/atombios_encoders.c
> +++ b/drivers/gpu/drm/radeon/atombios_encoders.c
> @@ -1625,7 +1625,7 @@ radeon_atom_encoder_dpms_dig(struct drm_encoder *encoder, int mode)
>  			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_SETUP, 0, 0);
>  			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE, 0, 0);
>  			/* some early dce3.2 boards have a bug in their transmitter control table */
> -			if ((rdev->family != CHIP_RV710) || (rdev->family != CHIP_RV730))
> +			if ((rdev->family != CHIP_RV710) && (rdev->family != CHIP_RV730))

Ouch, the compiler didn't warn about this always evaluating to true?


-- 
Earthling Michel Dänzer           |                   http://www.amd.com
Libre software enthusiast         |          Debian, X and DRI developer