diff options
| author | Eric Tashakkor <w36098@motorola.com> | 2014-04-02 09:38:23 -0500 |
|---|---|---|
| committer | Eric Tashakkor <w36098@motorola.com> | 2014-04-02 09:38:23 -0500 |
| commit | 95ccb340360c3baf61af491dc9d56906b226176e (patch) | |
| tree | 68b1e0ac20f8e9e29768433be5047719fcdc1c87 /drivers/misc/m4sensorhub_als.c | |
| parent | 0035f53710a67a53f1c9863c688ac96a302f86da (diff) | |
| download | olio-linux-3.10-95ccb340360c3baf61af491dc9d56906b226176e.tar.xz olio-linux-3.10-95ccb340360c3baf61af491dc9d56906b226176e.zip | |
IKXCLOCK-569 Update M4 Pedometer Driver with Sysfs and IIO Reporting
Added IIO and sysfs functionality.
Removed input.h changes associated with this driver.
Backported fixes/updates to heartrate sensor.
Fixed error in ALS sensor that would unregister the wrong interrupt.
Change-Id: I0983c1119efb7f268f968e0a7fe9dc96192cdc42
Signed-off-by: Eric Tashakkor <w36098@motorola.com>
Diffstat (limited to 'drivers/misc/m4sensorhub_als.c')
| -rw-r--r-- | drivers/misc/m4sensorhub_als.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/misc/m4sensorhub_als.c b/drivers/misc/m4sensorhub_als.c index c87f2656abe..da3b7a00d1a 100644 --- a/drivers/misc/m4sensorhub_als.c +++ b/drivers/misc/m4sensorhub_als.c @@ -353,10 +353,11 @@ static int __exit m4als_remove(struct platform_device *pdev) mutex_lock(&(dd->mutex)); m4als_remove_sysfs(dd); if (dd->status & (1 << M4ALS_IRQ_ENABLED_BIT)) { - m4sensorhub_irq_disable(dd->m4, M4SH_IRQ_PRESSURE_DATA_READY); + m4sensorhub_irq_disable(dd->m4, + M4SH_IRQ_LIGHTSENSOR_DATA_READY); dd->status = dd->status & ~(1 << M4ALS_IRQ_ENABLED_BIT); } - m4sensorhub_irq_unregister(dd->m4, M4SH_IRQ_PRESSURE_DATA_READY); + m4sensorhub_irq_unregister(dd->m4, M4SH_IRQ_LIGHTSENSOR_DATA_READY); m4sensorhub_unregister_initcall(m4als_driver_init); if (dd->indev != NULL) input_unregister_device(dd->indev); |