mirror of
https://github.com/torvalds/linux
synced 2024-10-10 13:24:04 +00:00
GNSS updates for 5.8-rc1
Here are the GNSS updates for 5.8-rc1, including: - a fix for two broken probe errors paths in the sirf driver - a flexible array conversion Both have been in linux-next with no reported issues. -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQQHbPq+cpGvN/peuzMLxc3C7H1lCAUCXtC9/gAKCRALxc3C7H1l CKuVAQCJYN78yPlOI6CzEmLryG1A5XZYp5V2ytNGDbn0lWwXMQEAqC2Eq+eRUFGx aWrhLtQGBVLUgI1liNSGo5v+nU08PQs= =O5Gh -----END PGP SIGNATURE----- Merge tag 'gnss-5.8-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss into char-misc-next Johan writes: GNSS updates for 5.8-rc1 Here are the GNSS updates for 5.8-rc1, including: - a fix for two broken probe errors paths in the sirf driver - a flexible array conversion Both have been in linux-next with no reported issues. * tag 'gnss-5.8-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss: gnss: replace zero-length array with flexible-array gnss: sirf: fix error return code in sirf_probe()
This commit is contained in:
commit
fb6d8d12ed
|
@ -16,7 +16,7 @@ struct gnss_serial {
|
|||
struct gnss_device *gdev;
|
||||
speed_t speed;
|
||||
const struct gnss_serial_ops *ops;
|
||||
unsigned long drvdata[0];
|
||||
unsigned long drvdata[];
|
||||
};
|
||||
|
||||
enum gnss_serial_pm_state {
|
||||
|
|
|
@ -439,14 +439,18 @@ static int sirf_probe(struct serdev_device *serdev)
|
|||
|
||||
data->on_off = devm_gpiod_get_optional(dev, "sirf,onoff",
|
||||
GPIOD_OUT_LOW);
|
||||
if (IS_ERR(data->on_off))
|
||||
if (IS_ERR(data->on_off)) {
|
||||
ret = PTR_ERR(data->on_off);
|
||||
goto err_put_device;
|
||||
}
|
||||
|
||||
if (data->on_off) {
|
||||
data->wakeup = devm_gpiod_get_optional(dev, "sirf,wakeup",
|
||||
GPIOD_IN);
|
||||
if (IS_ERR(data->wakeup))
|
||||
if (IS_ERR(data->wakeup)) {
|
||||
ret = PTR_ERR(data->wakeup);
|
||||
goto err_put_device;
|
||||
}
|
||||
|
||||
ret = regulator_enable(data->vcc);
|
||||
if (ret)
|
||||
|
|
Loading…
Reference in a new issue