diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2011-12-02 18:15:27 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-12-07 10:44:38 +0000 |
| commit | dc87cd5c264cb587f16459285565830689ecf7a7 (patch) | |
| tree | 9c167b57024149912c05d0cf211ed0416671bc0f /drivers | |
| parent | 45e713efe2fa574b6662e7fb63fae9497c5e03d4 (diff) | |
| download | linux-3.10-dc87cd5c264cb587f16459285565830689ecf7a7.tar.gz linux-3.10-dc87cd5c264cb587f16459285565830689ecf7a7.tar.bz2 linux-3.10-dc87cd5c264cb587f16459285565830689ecf7a7.zip | |
drm/radeon/kms: fix return type for radeon_encoder_get_dp_bridge_encoder_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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_encoders.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c index 06e413e6a92..4b27efa4405 100644 --- a/drivers/gpu/drm/radeon/radeon_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_encoders.c @@ -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, |