From patchwork Fri Oct 16 20:22:47 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Corentin Chary <corentincj@iksaif.net>
X-Patchwork-Id: 54413
X-Patchwork-Delegate: lenb@kernel.org
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9GKLvaS024570
	for <patchwork-acpi@patchwork.kernel.org>;
	Fri, 16 Oct 2009 20:21:57 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752101AbZJPUVu (ORCPT
	<rfc822;patchwork-acpi@patchwork.kernel.org>);
	Fri, 16 Oct 2009 16:21:50 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752183AbZJPUVu
	(ORCPT <rfc822;linux-acpi-outgoing>);
	Fri, 16 Oct 2009 16:21:50 -0400
Received: from iksaif.net ([88.191.73.63]:43233 "EHLO iksaif.net"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752101AbZJPUVt (ORCPT <rfc822;linux-acpi@vger.kernel.org>);
	Fri, 16 Oct 2009 16:21:49 -0400
Received: from localhost.localdomain (cxr69-11-88-180-139-205.fbx.proxad.net
	[88.180.139.205]) (Authenticated sender: corentincj@iksaif.net)
	by iksaif.net (Postfix) with ESMTPA id A081DC9002B;
	Fri, 16 Oct 2009 22:22:00 +0200 (CEST)
From: Corentin Chary <corentincj@iksaif.net>
To: lenb@kernel.org
Cc: linux-acpi@vger.kernel.org, Luca Niccoli <lultimouomo@gmail.com>,
	Corentin Chary <corentincj@iksaif.net>, Len Brown <len.brown@intel.com>,
	Alan Jenkins <alan-jenkins@tuffmail.co.uk>,
	Matthew Garrett <mjg@redhat.com>,
	Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH 2/2] eeepc-laptop: don't enable camera at startup if it's
	already on.
Date: Fri, 16 Oct 2009 22:22:47 +0200
Message-Id: <1255724567-25597-3-git-send-email-corentincj@iksaif.net>
X-Mailer: git-send-email 1.6.5.rc2
In-Reply-To: <1255724567-25597-2-git-send-email-corentincj@iksaif.net>
References: <1255724567-25597-1-git-send-email-corentincj@iksaif.net>
	<1255724567-25597-2-git-send-email-corentincj@iksaif.net>
Sender: linux-acpi-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-acpi.vger.kernel.org>
X-Mailing-List: linux-acpi@vger.kernel.org


diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 789d6ae..4226e53 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);
 }
 
 /*