Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cdfd223 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

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: 37768b05 ("gnss: add generic serial driver")
Cc: stable <stable@vger.kernel.org>     # 4.19
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3b0fa609

drivers/gnss/serial.c

+2 −1
Original line number Diff line number Diff line
@@ -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;