diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-09-20 09:36:22 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-09-20 09:36:22 +0100 |
| commit | 88ef4e3f4f616462b78a7838eb3ffc3818d30f67 (patch) | |
| tree | fe0cf551414b85e0b5c3c05e2a0d0b6ea95252f4 /drivers/gpu/drm/i915/intel_acpi.c | |
| parent | b2d108ba333cdff80d9e7645d7697cbb6bb0fc29 (diff) | |
| parent | 0206e353a0416ad63ce07f53c807c2c725633b87 (diff) | |
Merge branch 'drm-intel-next' of git://people.freedesktop.org/~keithp/linux into drm-next
* 'drm-intel-next' of git://people.freedesktop.org/~keithp/linux:
Drivers: i915: Fix all space related issues.
Diffstat (limited to 'drivers/gpu/drm/i915/intel_acpi.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_acpi.c b/drivers/gpu/drm/i915/intel_acpi.c index 2cb8e0b9f1e..cb912106d1a 100644 --- a/drivers/gpu/drm/i915/intel_acpi.c +++ b/drivers/gpu/drm/i915/intel_acpi.c @@ -64,7 +64,7 @@ static int intel_dsm(acpi_handle handle, int func, int arg) case ACPI_TYPE_BUFFER: if (obj->buffer.length == 4) { - result =(obj->buffer.pointer[0] | + result = (obj->buffer.pointer[0] | (obj->buffer.pointer[1] << 8) | (obj->buffer.pointer[2] << 16) | (obj->buffer.pointer[3] << 24)); |