diff options
| author | Johan Hovold <johan@kernel.org> | 2018-11-14 11:33:57 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-27 18:13:10 +0300 |
| commit | 9cdfd2233a6b6e98f5221764b634227bdf6c1764 (patch) | |
| tree | 7bacd9952cf3b76412a654e3d85357a47bd7edeb /drivers/gnss | |
| parent | 3b0fa609e00140ee1ca7300eb6fd023ba5b00193 (diff) | |
| download | linux-9cdfd2233a6b6e98f5221764b634227bdf6c1764.tar.xz | |
gnss: serial: fix synchronous write timeout
commit 56a6c7268312cba9436b84cac01b3e502c5c511d upstream.
Passing a timeout of zero to the synchronous serdev_device_write()
helper does currently not imply to wait forever (unlike passing zero to
serdev_device_wait_until_sent()). Instead, if there's insufficient
room in the write buffer, we'd end up with an incomplete write.
Fixes: 37768b054f20 ("gnss: add generic serial driver")
Cc: stable <stable@vger.kernel.org> # 4.19
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gnss')
| -rw-r--r-- | drivers/gnss/serial.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gnss/serial.c b/drivers/gnss/serial.c index b01ba4438501..31e891f00175 100644 --- a/drivers/gnss/serial.c +++ b/drivers/gnss/serial.c @@ -13,6 +13,7 @@ #include <linux/of.h> #include <linux/pm.h> #include <linux/pm_runtime.h> +#include <linux/sched.h> #include <linux/serdev.h> #include <linux/slab.h> @@ -63,7 +64,7 @@ static int gnss_serial_write_raw(struct gnss_device *gdev, int ret; /* write is only buffered synchronously */ - ret = serdev_device_write(serdev, buf, count, 0); + ret = serdev_device_write(serdev, buf, count, MAX_SCHEDULE_TIMEOUT); if (ret < 0) return ret; |