diff -pruN 0.4.1-3/debian/changelog 0.4.1-3ubuntu1/debian/changelog
--- 0.4.1-3/debian/changelog	2021-11-24 14:44:06.000000000 +0000
+++ 0.4.1-3ubuntu1/debian/changelog	2021-11-25 15:33:56.000000000 +0000
@@ -1,3 +1,15 @@
+ddcci-driver-linux (0.4.1-3ubuntu1) jammy; urgency=medium
+
+  [ Andrea Righi ]
+  * Fix build error on linux 5.15 (LP: #1951608)
+    - debian/patches/0010-fix-build-error-with-linux-5.15.patch
+
+  [ Dimitri John Ledkov ]
+  * Drop the Debian's patch in favor of a better upstream patch
+    cherrypicked by Andrea.
+
+ -- Dimitri John Ledkov <dimitri.ledkov@canonical.com>  Thu, 25 Nov 2021 15:33:56 +0000
+
 ddcci-driver-linux (0.4.1-3) unstable; urgency=medium
 
   * Handle all returns in the 5.15 patch. Really closes: #1000357.
diff -pruN 0.4.1-3/debian/control 0.4.1-3ubuntu1/debian/control
--- 0.4.1-3/debian/control	2021-09-01 15:28:59.000000000 +0000
+++ 0.4.1-3ubuntu1/debian/control	2021-11-25 15:27:49.000000000 +0000
@@ -1,5 +1,6 @@
 Source: ddcci-driver-linux
-Maintainer: Stephen Kitt <skitt@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Stephen Kitt <skitt@debian.org>
 Section: kernel
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
diff -pruN 0.4.1-3/debian/patches/0010-fix-build-error-with-linux-5.15.patch 0.4.1-3ubuntu1/debian/patches/0010-fix-build-error-with-linux-5.15.patch
--- 0.4.1-3/debian/patches/0010-fix-build-error-with-linux-5.15.patch	1970-01-01 00:00:00.000000000 +0000
+++ 0.4.1-3ubuntu1/debian/patches/0010-fix-build-error-with-linux-5.15.patch	2021-11-25 15:27:49.000000000 +0000
@@ -0,0 +1,34 @@
+Subject: Fix build for Linux 5.15 and bump version
+Author: MoetaYuko
+Origin: https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux/-/commit/bf9d79852cbd0aa5c2e288ce51b8280f74a1f5d2
+
+Index: ddcci-driver-linux-0.4.1/ddcci/ddcci.c
+===================================================================
+--- ddcci-driver-linux-0.4.1.orig/ddcci/ddcci.c
++++ ddcci-driver-linux-0.4.1/ddcci/ddcci.c
+@@ -1285,6 +1285,13 @@ static int ddcci_device_remove(struct de
+ 	return ret;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0)
++static void ddcci_device_remove_void(struct device *dev)
++{
++	ddcci_device_remove(dev);
++}
++#endif
++
+ /**
+  * DDCCI bus type structure
+  */
+@@ -1292,7 +1299,11 @@ struct bus_type ddcci_bus_type = {
+ 	.name		= "ddcci",
+ 	.match		= ddcci_device_match,
+ 	.probe		= ddcci_device_probe,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0)
++	.remove		= ddcci_device_remove_void
++#else
+ 	.remove		= ddcci_device_remove
++#endif
+ };
+ 
+ /* Main I2C driver */
diff -pruN 0.4.1-3/debian/patches/kernel-5.15-void-remove.patch 0.4.1-3ubuntu1/debian/patches/kernel-5.15-void-remove.patch
--- 0.4.1-3/debian/patches/kernel-5.15-void-remove.patch	2021-11-23 12:00:09.000000000 +0000
+++ 0.4.1-3ubuntu1/debian/patches/kernel-5.15-void-remove.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-Description: Adjust to bus_type.remove change in 5.15
-Author: Stephen Kitt <skitt@debian.org>
-
-bus_type.remove was changed to expect a function returning void in
-5.15, with commit fc7a6209d571 ("bus: Make remove callback return
-void").
-
---- a/ddcci/ddcci.c
-+++ b/ddcci/ddcci.c
-@@ -1269,20 +1269,30 @@
- 	return ret;
- }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)
- static int ddcci_device_remove(struct device *dev)
-+#else
-+static void ddcci_device_remove(struct device *dev)
-+#endif
- {
- 	struct ddcci_device	*device = ddcci_verify_device(dev);
- 	struct ddcci_driver	*driver;
- 	int ret = 0;
- 
- 	if (!device)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)
- 		return -EINVAL;
-+#else
-+		return;
-+#endif
- 	driver = to_ddcci_driver(dev->driver);
- 
- 	if (driver->remove)
- 		ret = driver->remove(device);
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)
- 	return ret;
-+#endif
- }
- 
- /**
diff -pruN 0.4.1-3/debian/patches/series 0.4.1-3ubuntu1/debian/patches/series
--- 0.4.1-3/debian/patches/series	2021-11-22 10:24:15.000000000 +0000
+++ 0.4.1-3ubuntu1/debian/patches/series	2021-11-25 15:28:49.000000000 +0000
@@ -1,3 +1,3 @@
 0002-Skip-build-if-BACKLIGHT_CLASS_DEVICE-off.patch
 pre-5.1-static_assert.patch
-kernel-5.15-void-remove.patch
+0010-fix-build-error-with-linux-5.15.patch