system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-10 13:24:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

GNSS updates for 5.8-rc1

Browse source 
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:
Greg Kroah-Hartman 2020-05-29 10:42:38 +02:00
parent d4014a6b46 9b5816b56a
commit fb6d8d12ed
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/gnss/serial.h
View file

@ -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 {

8
drivers/gnss/sirf.c
View file

@ -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)