diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2011-04-14 11:19:50 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-04-15 09:05:58 +1000 |
| commit | 8e461123f28e6b17456225e70eb834b3b30d28bb (patch) | |
| tree | 09160fe7c98372921cdf875b2cc59a33cd25423a /drivers/gpu | |
| parent | 2582b6efceb43dce63b4a1090d289934067a972d (diff) | |
| download | kernel_samsung_espresso10-8e461123f28e6b17456225e70eb834b3b30d28bb.zip kernel_samsung_espresso10-8e461123f28e6b17456225e70eb834b3b30d28bb.tar.gz kernel_samsung_espresso10-8e461123f28e6b17456225e70eb834b3b30d28bb.tar.bz2 | |
drm/radeon/kms: fix bad shift in atom iio table parser
Noticed by Patrick Lowry.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/atom.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c index d71d375..7bd7456 100644 --- a/drivers/gpu/drm/radeon/atom.c +++ b/drivers/gpu/drm/radeon/atom.c @@ -135,7 +135,7 @@ static uint32_t atom_iio_execute(struct atom_context *ctx, int base, case ATOM_IIO_MOVE_INDEX: temp &= ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << - CU8(base + 2)); + CU8(base + 3)); temp |= ((index >> CU8(base + 2)) & (0xFFFFFFFF >> (32 - CU8(base + 1)))) << CU8(base + @@ -145,7 +145,7 @@ static uint32_t atom_iio_execute(struct atom_context *ctx, int base, case ATOM_IIO_MOVE_DATA: temp &= ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << - CU8(base + 2)); + CU8(base + 3)); temp |= ((data >> CU8(base + 2)) & (0xFFFFFFFF >> (32 - CU8(base + 1)))) << CU8(base + @@ -155,7 +155,7 @@ static uint32_t atom_iio_execute(struct atom_context *ctx, int base, case ATOM_IIO_MOVE_ATTR: temp &= ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << - CU8(base + 2)); + CU8(base + 3)); temp |= ((ctx-> io_attr >> CU8(base + 2)) & (0xFFFFFFFF >> (32 - |