Re: [PATCHv2 2/7] input/cma3000_d0x: Check silicon version
From: Jonathan Cameron <hidden>
Date: 2011-10-18 12:54:37
Also in:
lkml
On 10/18/11 13:06, Ricardo Ribalda Delgado wrote:
Improve probing of the cma3000 chip, by checking the revision of the device. --- v2: Fixes suggested by Jonathan Cameron -Remove WhoamI pr_info Signed-off-by: Ricardo Ribalda Delgado <redacted>
Acked-by: Jonathan Cameron <redacted>
quoted hunk
--- 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 f2e87e3..3877cbe 100644 --- a/drivers/input/misc/cma3000_d0x.c +++ b/drivers/input/misc/cma3000_d0x.c@@ -26,6 +26,8 @@ #include "cma3000_d0x.h" +#define CMA3000_REV 0x10 + #define CMA3000_WHOAMI 0x00 #define CMA3000_REVID 0x01 #define CMA3000_CTRL 0x02@@ -366,7 +368,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,