git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://neil.brown.name/md
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
radeon
/
atombios_dp.c
diff --git
a/drivers/gpu/drm/radeon/atombios_dp.c
b/drivers/gpu/drm/radeon/atombios_dp.c
index 28b31c64f48dd4eee064356c1d8a2bd840165f0d..abffb1499e227a39b24170c3c0212d0613c41961 100644
(file)
--- a/
drivers/gpu/drm/radeon/atombios_dp.c
+++ b/
drivers/gpu/drm/radeon/atombios_dp.c
@@
-351,7
+351,7
@@
retry:
args.v1.ucChannelID = chan->rec.i2c_id;
args.v1.ucDelay = delay / 10;
if (ASIC_IS_DCE4(rdev))
- args.v2.ucHPD_ID = chan->rec.hpd
_id
;
+ args.v2.ucHPD_ID = chan->rec.hpd;
atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);