From b3f304bda632cf6304a126ffa21c0ad1a26703b8 Mon Sep 17 00:00:00 2001 From: Luca Niccoli Date: Fri, 16 Oct 2009 22:22:47 +0200 Subject: [PATCH] --- yaml --- r: 168294 b: refs/heads/master c: 80f0c895b57f0d936b420de6afea5167a49f62fa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/eeepc-laptop.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fa16025f6cee..38393f599b59 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58ce48a9de1dd47acb5dc00e2837214d2be1d92a +refs/heads/master: 80f0c895b57f0d936b420de6afea5167a49f62fa diff --git a/trunk/drivers/platform/x86/eeepc-laptop.c b/trunk/drivers/platform/x86/eeepc-laptop.c index 789d6ae003fb..4226e5352738 100644 --- a/trunk/drivers/platform/x86/eeepc-laptop.c +++ b/trunk/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); } /*