From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932623Ab1KBOtn (ORCPT ); Wed, 2 Nov 2011 10:49:43 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:64630 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932437Ab1KBOta (ORCPT ); Wed, 2 Nov 2011 10:49:30 -0400 From: Ricardo Ribalda Delgado To: grant.likely@secretlab.ca, rob.herring@calxeda.com, rdunlap@xenotime.net, dmitry.torokhov@gmail.com, jic23@cam.ac.uk, aghayal@codeaurora.org, sameo@linux.intel.com, peter.ujfalusi@ti.com, saaguirre@ti.com, hemanthv@ti.com, devicetree-discuss@lists.ozlabs.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-input@vger.kernel.org Cc: Ricardo Ribalda Delgado Subject: [PATCHv5 2/5] input/cma3000_d0x: Check silicon version Date: Wed, 2 Nov 2011 15:49:10 +0100 Message-Id: <1320245353-32125-3-git-send-email-ricardo.ribalda@gmail.com> X-Mailer: git-send-email 1.7.7.1 In-Reply-To: <1320245353-32125-1-git-send-email-ricardo.ribalda@gmail.com> References: <1320245353-32125-1-git-send-email-ricardo.ribalda@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Improve probing of the cma3000 chip, by checking the revision of the device. v4: Add ACKs to patch v2: Fixes suggested by Jonathan Cameron -Remove WhoamI pr_info Acked-by: Jonathan Cameron Signed-off-by: Ricardo Ribalda Delgado --- drivers/input/misc/cma3000_d0x.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/drivers/input/misc/cma3000_d0x.c b/drivers/input/misc/cma3000_d0x.c index e66036d..97e36fa 100644 --- a/drivers/input/misc/cma3000_d0x.c +++ b/drivers/input/misc/cma3000_d0x.c @@ -27,6 +27,8 @@ #include "cma3000_d0x.h" +#define CMA3000_REV 0x10 + #define CMA3000_WHOAMI 0x00 #define CMA3000_REVID 0x01 #define CMA3000_CTRL 0x02 @@ -420,7 +422,11 @@ struct cma3000_accl_data *cma3000_init(struct device *dev, int irq, error = rev; goto err_free_mem; } - + if (rev != CMA3000_REV) { + error = -EINVAL; + pr_err("CMA3000 Accelerometer: Unknown Revision %x\n", rev); + goto err_free_mem; + } pr_info("CMA3000 Accelerometer: Revision %x\n", rev); error = request_threaded_irq(irq, NULL, cma3000_thread_irq, -- 1.7.7.1