p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gnss: sirf: fix premature wakeup interrupt enable 

Make sure the receiver is powered (and booted) before enabling the
wakeup interrupt to avoid spurious interrupts due to a floating input.

Similarly, disable the interrupt before powering off on probe errors and
on unbind.

Fixes: d2efbbd18b ("gnss: add driver for sirfstar-based receivers")
Cc: stable <stable@vger.kernel.org>	# 4.19
Signed-off-by: Johan Hovold <johan@kernel.org>
This commit is contained in:
Johan Hovold 2019-01-22 18:22:53 +01:00
parent 49a57857ae
commit 82f844c225
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/gnss/sirf.c
View File

@ -310,30 +310,26 @@ static int sirf_probe(struct serdev_device *serdev)
ret = -ENODEV; ret = -ENODEV;
goto err_put_device; goto err_put_device;
} }
ret = regulator_enable(data->vcc);
if (ret)
goto err_put_device;
/* Wait for chip to boot into hibernate mode. */
msleep(SIRF_BOOT_DELAY);
} }
if (data->wakeup) { if (data->wakeup) {
ret = gpiod_to_irq(data->wakeup); ret = gpiod_to_irq(data->wakeup);
if (ret < 0) if (ret < 0)
goto err_put_device; goto err_disable_vcc;
data->irq = ret; data->irq = ret;
ret = devm_request_threaded_irq(dev, data->irq, NULL, ret = request_threaded_irq(data->irq, NULL, sirf_wakeup_handler,
sirf_wakeup_handler,
IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
"wakeup", data); "wakeup", data);
if (ret) if (ret)
goto err_put_device; goto err_disable_vcc;
}
if (data->on_off) {
ret = regulator_enable(data->vcc);
if (ret)
goto err_put_device;
/* Wait for chip to boot into hibernate mode */
msleep(SIRF_BOOT_DELAY);
} }
if (IS_ENABLED(CONFIG_PM)) { if (IS_ENABLED(CONFIG_PM)) {
@ -342,7 +338,7 @@ static int sirf_probe(struct serdev_device *serdev)
} else { } else {
ret = sirf_runtime_resume(dev); ret = sirf_runtime_resume(dev);
if (ret < 0) if (ret < 0)
goto err_disable_vcc; goto err_free_irq;
} }
ret = gnss_register_device(gdev); ret = gnss_register_device(gdev);
@ -356,6 +352,9 @@ static int sirf_probe(struct serdev_device *serdev)
pm_runtime_disable(dev); pm_runtime_disable(dev);
else else
sirf_runtime_suspend(dev); sirf_runtime_suspend(dev);
err_free_irq:
if (data->wakeup)
free_irq(data->irq, data);
err_disable_vcc: err_disable_vcc:
if (data->on_off) if (data->on_off)
regulator_disable(data->vcc); regulator_disable(data->vcc);
@ -376,6 +375,9 @@ static void sirf_remove(struct serdev_device *serdev)
else else
sirf_runtime_suspend(&serdev->dev); sirf_runtime_suspend(&serdev->dev);
if (data->wakeup)
free_irq(data->irq, data);
if (data->on_off) if (data->on_off)
regulator_disable(data->vcc); regulator_disable(data->vcc);