diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-29 18:48:02 +0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-29 18:48:02 +0400 |
commit | 129961ecaf21c9ee899ad9067d917c1aa172fb7a (patch) | |
tree | 49eafdcf4d6ac490ecdd92c36c285817872eaf34 /drivers/gpu/drm/radeon/radeon_kms.c | |
parent | 392c57a2ec811db37ae45adc513704cf92ba3e69 (diff) | |
parent | cccf59abea4e1c36322e365d6e61ff7de1f3ee07 (diff) | |
download | linux-129961ecaf21c9ee899ad9067d917c1aa172fb7a.tar.xz |
Merge branch 'wells/lpc32xx-arch_v2' of git://git.lpclinux.com/linux-2.6-lpc into devel-stable
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_kms.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_kms.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c index 6a70c0dc7f92..ab389f89fa8d 100644 --- a/drivers/gpu/drm/radeon/radeon_kms.c +++ b/drivers/gpu/drm/radeon/radeon_kms.c @@ -128,7 +128,8 @@ int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) for (i = 0, found = 0; i < rdev->num_crtc; i++) { crtc = (struct drm_crtc *)minfo->crtcs[i]; if (crtc && crtc->base.id == value) { - value = i; + struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); + value = radeon_crtc->crtc_id; found = 1; break; } |