aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform/x86
diff options
context:
space:
mode:
authorLuca Niccoli <lultimouomo@gmail.com>2009-10-16 22:22:47 +0200
committerLen Brown <len.brown@intel.com>2009-11-03 10:24:19 -0500
commit80f0c895b57f0d936b420de6afea5167a49f62fa (patch)
tree638be689b9ee6407c11002468f4338fc46002765 /drivers/platform/x86
parent58ce48a9de1dd47acb5dc00e2837214d2be1d92a (diff)
downloadmrst-s0i3-test-80f0c895b57f0d936b420de6afea5167a49f62fa.tar.gz
mrst-s0i3-test-80f0c895b57f0d936b420de6afea5167a49f62fa.tar.xz
mrst-s0i3-test-80f0c895b57f0d936b420de6afea5167a49f62fa.zip
eeepc-laptop: don't enable camera at startup if it's already on.
Switching the camera takes 500ms, checking if it's on is almost free... The BIOS remembers the setting through reboots, so there's good chance the camera is already enabled. Signed-off-by: Luca Niccoli <lultimouomo@gmail.com> Cc: Corentin Chary <corentincj@iksaif.net> Cc: Alan Jenkins <alan-jenkins@tuffmail.co.uk> Cc: Matthew Garrett <mjg@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Corentin Chary <corentincj@iksaif.net> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/platform/x86')
-rw-r--r--drivers/platform/x86/eeepc-laptop.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 789d6ae003f..4226e535273 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -356,7 +356,8 @@ static void __devinit eeepc_enable_camera(void)
* If the following call to set_acpi() fails, it's because there's no
* camera so we can ignore the error.
*/
- set_acpi(CM_ASL_CAMERA, 1);
+ if (get_acpi(CM_ASL_CAMERA) == 0)
+ set_acpi(CM_ASL_CAMERA, 1);
}
/*