From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 11 Dec 2023 08:10:42 +0000 (+0100)
Subject: Merge 6.7-rc5 into tty-next
X-Git-Tag: v6.8-rc1~59^2~63
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e045e18dbf3eaac32cdeb2799a5ec84fa694636c;p=thirdparty%2Fkernel%2Flinux.git

Merge 6.7-rc5 into tty-next

We need the serial fixes in here as well to build off of.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

e045e18dbf3eaac32cdeb2799a5ec84fa694636c
diff --cc drivers/platform/surface/aggregator/core.c
index 72d7314a4efd7,6152be38398c4..9591a28bc38a9
--- a/drivers/platform/surface/aggregator/core.c
+++ b/drivers/platform/surface/aggregator/core.c
@@@ -227,13 -227,16 +227,16 @@@ EXPORT_SYMBOL_GPL(ssam_client_bind)
  
  /* -- Glue layer (serdev_device -> ssam_controller). ------------------------ */
  
 -static int ssam_receive_buf(struct serdev_device *dev, const unsigned char *buf,
 -			    size_t n)
 +static ssize_t ssam_receive_buf(struct serdev_device *dev, const u8 *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)