projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
45e713e
)
drm/radeon/kms: fix return type for radeon_encoder_get_dp_bridge_encoder_id
author
Alex Deucher
<
[email protected]
>
Fri, 2 Dec 2011 23:15:27 +0000
(18:15 -0500)
committer
Dave Airlie
<
[email protected]
>
Wed, 7 Dec 2011 10:44:38 +0000
(10:44 +0000)
Seems like something got mis-merged here.
Noticed by kallisti5 on IRC.
Signed-off-by: Alex Deucher <
[email protected]
>
Signed-off-by: Dave Airlie <
[email protected]
>
drivers/gpu/drm/radeon/radeon_encoders.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/radeon/radeon_encoders.c
b/drivers/gpu/drm/radeon/radeon_encoders.c
index 06e413e6a920207850734185f1c459989616f625..4b27efa4405b94b63011b2e8948d678c35ccfd62 100644
(file)
--- 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,