Unverified Commit c8820c92 authored by Francesco Dolcini's avatar Francesco Dolcini Committed by Ilpo Järvinen
Browse files

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



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: c167b9c7 ("platform/surface: Add Surface Aggregator subsystem")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarFrancesco Dolcini <francesco.dolcini@toradex.com>
Reviewed-by: default avatarMaximilian Luz <luzmaximilian@gmail.com>
Link: https://lore.kernel.org/r/20231128194935.11350-1-francesco@dolcini.it


Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
parent e0894ff0

drivers/platform/surface/aggregator/core.c

+4 −1
Original line number Diff line number Diff line
@@ -231,9 +231,12 @@ static int ssam_receive_buf(struct serdev_device *dev, const unsigned char *buf, 
			    size_t n)

{

	struct ssam_controller *ctrl;

	int ret;



	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)