improve openvfd patch

3 files changed, 35 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4261f9a04a9d..348bc9284b64 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-aarch64-flippy
 	pkgver = 6.1.26
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/unifreq/linux-6.1.y
 	arch = aarch64
 	license = GPL2
@@ -16,7 +16,7 @@ pkgbase = linux-aarch64-flippy
 	sha256sums = 56db5ed562987e41eb4efdce21193cf28c7e3cafc6a91457de729b2f25d92822
 	sha256sums = eea825bef9a873be55cab26035cc6b16e210f4effba905fadc22de444e2b7f30
 	sha256sums = bdcd6cbf19284b60fac6d6772f1e0ec2e2fe03ce7fe3d7d16844dd6d2b5711f3
-	sha256sums = 6fcc328ca286e8fa86d8988aa2f01afdd41cf650425baa967eebbb9e29bca5a4
+	sha256sums = d4a47c25f5822fe05a473a9ccd8b749429adb23519a72b9043fe42530f990321
 
 pkgname = linux-aarch64-flippy
 	pkgdesc = The Linux Kernel and module - flippy's AArch64-focused fork aiming to increase usability
diff --git a/0001-drivers-auxdisplay-openvfd-improve-dev-write-logic.patch b/0001-drivers-auxdisplay-openvfd-improve-dev-write-logic.patch
index 5c26728bce1a..c55e0072b5d3 100644
--- a/0001-drivers-auxdisplay-openvfd-improve-dev-write-logic.patch
+++ b/0001-drivers-auxdisplay-openvfd-improve-dev-write-logic.patch
@@ -1,14 +1,14 @@
-From ae04984a5b4905b6326f9c1d94c554381d289634 Mon Sep 17 00:00:00 2001
+From d227986a882ccb62922fb6545bf0c971e6447e19 Mon Sep 17 00:00:00 2001
 From: 7Ji <pugokushin@gmail.com>
-Date: Thu, 27 Apr 2023 23:46:33 +0800
+Date: Sat, 29 Apr 2023 20:00:58 +0800
 Subject: [PATCH] drivers: auxdisplay: openvfd: improve dev write logic
 
 ---
- drivers/auxdisplay/openvfd/openvfd_drv.c | 64 ++++++++++++++----------
- 1 file changed, 37 insertions(+), 27 deletions(-)
+ drivers/auxdisplay/openvfd/openvfd_drv.c | 66 +++++++++++++-----------
+ 1 file changed, 37 insertions(+), 29 deletions(-)
 
 diff --git a/drivers/auxdisplay/openvfd/openvfd_drv.c b/drivers/auxdisplay/openvfd/openvfd_drv.c
-index bd1a4c0d2..485fa48d9 100644
+index bd1a4c0d2..077ef767a 100644
 --- a/drivers/auxdisplay/openvfd/openvfd_drv.c
 +++ b/drivers/auxdisplay/openvfd/openvfd_drv.c
 @@ -216,6 +216,8 @@ static ssize_t openvfd_dev_read(struct file *filp, char __user * buf,
@@ -20,28 +20,37 @@ index bd1a4c0d2..485fa48d9 100644
  /**
   * @param buf: Incoming LED codes.
   * 		  [0]	Display indicators mask (wifi, eth, usb, etc.)
-@@ -226,40 +228,48 @@ static ssize_t openvfd_dev_write(struct file *filp, const char __user * buf,
+@@ -226,40 +228,46 @@ static ssize_t openvfd_dev_write(struct file *filp, const char __user * buf,
  				   size_t count, loff_t * f_pos)
  {
  	ssize_t status = 0;
 -	unsigned long missing;
- 	static struct vfd_display_data data;
+-	static struct vfd_display_data data;
 -
 -	if (count == sizeof(data)) {
 -		missing = copy_from_user(&data, buf, count);
 -		if (missing == 0 && count > 0) {
-+	static unsigned char raw_data[OPENVFD_DEV_WRITE_RAW_LENGTH];
+-			mutex_lock(&mutex);
+-			if (controller->write_display_data(&data))
+-				pr_dbg("openvfd_dev_write count : %ld\n", count);
+-			else {
+-				status = -1;
+-				pr_error("openvfd_dev_write failed to write %ld bytes (display_data)\n", count);
+-			}
+-			mutex_unlock(&mutex);
++	union {
++		struct vfd_display_data st;
++		unsigned char raw[OPENVFD_DEV_WRITE_RAW_LENGTH];
++	} data;
 +
 +	if (count > 0) {
-+		void *data_p;
++		void *data_p = &data;
 +		bool should_free = false;
 +		bool write_raw = false;
 +		switch (count) {
-+			case sizeof data:
-+				data_p = &data;
++			case sizeof data.st:
 +				break;
-+			case OPENVFD_DEV_WRITE_RAW_LENGTH:
-+				data_p = raw_data;
++			case sizeof data.raw:
 +				write_raw = true;
 +				break;
 +			default:
@@ -52,32 +61,23 @@ index bd1a4c0d2..485fa48d9 100644
 +				should_free = true;
 +				write_raw = true;
 +				break;
-+		}
-+		if (!copy_from_user(data_p, buf, count)) {
-+			size_t write_count = 0;
- 			mutex_lock(&mutex);
--			if (controller->write_display_data(&data))
--				pr_dbg("openvfd_dev_write count : %ld\n", count);
--			else {
--				status = -1;
--				pr_error("openvfd_dev_write failed to write %ld bytes (display_data)\n", count);
-+			if (write_raw) {
-+				write_count = controller->write_data((unsigned char*)raw_data, count);
-+			} else {
-+				write_count = controller->write_display_data(&data);
- 			}
- 			mutex_unlock(&mutex);
--		}
+ 		}
 -	} else if (count > 0) {
 -		unsigned char *raw_data;
 -		pr_dbg2("openvfd_dev_write: count = %ld, sizeof(data) = %ld\n", count, sizeof(data));
 -		raw_data = kzalloc(count, GFP_KERNEL);
 -		if (raw_data) {
 -			missing = copy_from_user(raw_data, buf, count);
--			mutex_lock(&mutex);
++		if (!copy_from_user(data_p, buf, count)) {
++			size_t write_count;
+ 			mutex_lock(&mutex);
 -			if (controller->write_data((unsigned char*)raw_data, count))
 -				pr_dbg("openvfd_dev_write count : %ld\n", count);
 -			else {
++			write_count = write_raw ?
++				controller->write_data(data_p, count) :
++				controller->write_display_data(data_p);
++			mutex_unlock(&mutex);
 +			if (write_count) {
 +				pr_dbg("openvfd_dev_write %ld from %ld bytes\n", write_count, count);
 +			} else {
@@ -97,5 +97,5 @@ index bd1a4c0d2..485fa48d9 100644
  	}
  
 -- 
-2.40.0
+2.40.1
 
diff --git a/PKGBUILD b/PKGBUILD
index 63b048b75278..78f26f254b6c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,7 +17,7 @@ pkgname=(
   "${pkgbase}-dtb-rockchip"
 )
 pkgver="${_pkgver_main}"
-pkgrel=1
+pkgrel=2
 arch=('aarch64')
 url="https://github.com/unifreq/${_flippy_repo}"
 license=('GPL2')
@@ -35,7 +35,7 @@ sha256sums=(
   '56db5ed562987e41eb4efdce21193cf28c7e3cafc6a91457de729b2f25d92822'
   'eea825bef9a873be55cab26035cc6b16e210f4effba905fadc22de444e2b7f30'
   'bdcd6cbf19284b60fac6d6772f1e0ec2e2fe03ce7fe3d7d16844dd6d2b5711f3'
-  '6fcc328ca286e8fa86d8988aa2f01afdd41cf650425baa967eebbb9e29bca5a4'
+  'd4a47c25f5822fe05a473a9ccd8b749429adb23519a72b9043fe42530f990321'
 )
 
 prepare() {