korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

platform/surface: aggregator: fix recv_buf() return value

Browse Source 
Serdev recv_buf() callback is supposed to return the amount of bytes
consumed, therefore an int in between 0 and count.

Do not return negative number in case of issue, when
ssam_controller_receive_buf() returns ESHUTDOWN just returns 0, e.g. no
bytes consumed, this keep the exact same behavior as it was before.

This fixes a potential WARN in serdev-ttyport.c:ttyport_receive_buf().

Fixes: c167b9c7e3 ("platform/surface: Add Surface Aggregator subsystem")
Cc: stable@vger.kernel.org
Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Reviewed-by: Maximilian Luz <luzmaximilian@gmail.com>
Link: https://lore.kernel.org/r/20231128194935.11350-1-francesco@dolcini.it
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
This commit is contained in:
Francesco Dolcini 2023-11-28 20:49:35 +01:00 committed by Ilpo Järvinen
parent e0894ff038
commit c8820c92ca
No known key found for this signature in database
GPG Key ID: 59AC4F6153E5CE31
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/platform/surface/aggregator/core.c
View File

@ -231,9 +231,12 @@ static int ssam_receive_buf(struct serdev_device *dev, const unsigned char *buf,
size_t n) size_t n)
{ {
struct ssam_controller *ctrl; struct ssam_controller *ctrl;
int ret;
ctrl = serdev_device_get_drvdata(dev); ctrl = serdev_device_get_drvdata(dev);
return ssam_controller_receive_buf(ctrl, buf, n); ret = ssam_controller_receive_buf(ctrl, buf, n);
return ret < 0 ? 0 : ret;
} }
static void ssam_write_wakeup(struct serdev_device *dev) static void ssam_write_wakeup(struct serdev_device *dev)