Skip to content

Commit

Permalink
drm/radeon/kms: fix return type for radeon_encoder_get_dp_bridge_enco…
Browse files Browse the repository at this point in the history
…der_id

Seems like something got mis-merged here.

Noticed by kallisti5 on IRC.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
  • Loading branch information
Alex Deucher authored and Dave Airlie committed Dec 7, 2011
1 parent 45e713e commit dc87cd5
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions drivers/gpu/drm/radeon/radeon_encoders.c
Original file line number Diff line number Diff line change
Expand Up @@ -233,13 +233,12 @@ u16 radeon_encoder_get_dp_bridge_encoder_id(struct drm_encoder *encoder)
switch (radeon_encoder->encoder_id) {
case ENCODER_OBJECT_ID_TRAVIS:
case ENCODER_OBJECT_ID_NUTMEG:
return true;
return radeon_encoder->encoder_id;
default:
return false;
return ENCODER_OBJECT_ID_NONE;
}
}

return false;
return ENCODER_OBJECT_ID_NONE;
}

void radeon_panel_mode_fixup(struct drm_encoder *encoder,
Expand Down

0 comments on commit dc87cd5

Please sign in to comment.