Skip to content

Commit

Permalink
gnss: sirf: fix synchronous write timeout
Browse files Browse the repository at this point in the history
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: d2efbbd ("gnss: add driver for sirfstar-based receivers")
Cc: stable <[email protected]>     # 4.19
Signed-off-by: Johan Hovold <[email protected]>
  • Loading branch information
jhovold committed Nov 14, 2018
1 parent 56a6c72 commit 1decef3
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/gnss/sirf.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include <linux/pm.h>
#include <linux/pm_runtime.h>
#include <linux/regulator/consumer.h>
#include <linux/sched.h>
#include <linux/serdev.h>
#include <linux/slab.h>
#include <linux/wait.h>
Expand Down Expand Up @@ -83,7 +84,7 @@ static int sirf_write_raw(struct gnss_device *gdev, const unsigned char *buf,
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;

Expand Down

0 comments on commit 1decef3

Please sign in to comment.