diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 18:04:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 18:04:52 -0700 |
| commit | 75a1e32cce30ab1c5a361ebae24a18753e42feaa (patch) | |
| tree | 4f4a2fce8c81750f2f28e90149a6ee30fdeec1b6 /drivers/gpu/drm | |
| parent | c206d44ffdd539f5f4553e1a92cc7711084c1d3c (diff) | |
| parent | 54b9b308fa39e5147e2edde3492d8650b957be6c (diff) | |
Merge git://git.infradead.org/~dwmw2/ideapad-2.6
* git://git.infradead.org/~dwmw2/ideapad-2.6:
Call acpi_video_register() in intel_opregion_init() failure path
ideapad: Only allow camera state to be set to 0 or 1
ideapad: Stop using global variables
Add Lenovo ideapad driver
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_opregion.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_opregion.c b/drivers/gpu/drm/i915/i915_opregion.c index 8fcc75c1aa2..d1bf92b9978 100644 --- a/drivers/gpu/drm/i915/i915_opregion.c +++ b/drivers/gpu/drm/i915/i915_opregion.c @@ -535,6 +535,7 @@ int intel_opregion_init(struct drm_device *dev, int resume) err_out: iounmap(opregion->header); opregion->header = NULL; + acpi_video_register(); return err; } |