projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
[cascardo/linux.git]
/
drivers
/
iio
/
proximity
/
sx9500.c
diff --git
a/drivers/iio/proximity/sx9500.c
b/drivers/iio/proximity/sx9500.c
index
1d74b3a
..
1f06282
100644
(file)
--- a/
drivers/iio/proximity/sx9500.c
+++ b/
drivers/iio/proximity/sx9500.c
@@
-516,7
+516,7
@@
static irqreturn_t sx9500_irq_thread_handler(int irq, void *private)
sx9500_push_events(indio_dev);
if (val & SX9500_CONVDONE_IRQ)
sx9500_push_events(indio_dev);
if (val & SX9500_CONVDONE_IRQ)
- complete
_all
(&data->completion);
+ complete(&data->completion);
out:
mutex_unlock(&data->mutex);
out:
mutex_unlock(&data->mutex);
@@
-1025,6
+1025,12
@@
static const struct acpi_device_id sx9500_acpi_match[] = {
};
MODULE_DEVICE_TABLE(acpi, sx9500_acpi_match);
};
MODULE_DEVICE_TABLE(acpi, sx9500_acpi_match);
+static const struct of_device_id sx9500_of_match[] = {
+ { .compatible = "semtech,sx9500", },
+ { }
+};
+MODULE_DEVICE_TABLE(of, sx9500_of_match);
+
static const struct i2c_device_id sx9500_id[] = {
{"sx9500", 0},
{ },
static const struct i2c_device_id sx9500_id[] = {
{"sx9500", 0},
{ },
@@
-1035,6
+1041,7
@@
static struct i2c_driver sx9500_driver = {
.driver = {
.name = SX9500_DRIVER_NAME,
.acpi_match_table = ACPI_PTR(sx9500_acpi_match),
.driver = {
.name = SX9500_DRIVER_NAME,
.acpi_match_table = ACPI_PTR(sx9500_acpi_match),
+ .of_match_table = of_match_ptr(sx9500_of_match),
.pm = &sx9500_pm_ops,
},
.probe = sx9500_probe,
.pm = &sx9500_pm_ops,
},
.probe = sx9500_probe,