]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
UBUNTU: SAUCE: Fix build error for kernel 5.15
authorIgnacio Hernandez <ignacio.hernandez@gmail.com>
Thu, 2 Dec 2021 05:47:59 +0000 (21:47 -0800)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Tue, 31 May 2022 16:26:28 +0000 (18:26 +0200)
BugLink: https://bugs.launchpad.net/bugs/1955383
Signed-off-by: Ignacio Hernandez <ignacio.hernandez@gmail.com>
(cherry picked from commit 8659a022b39a23409c18341c3877689c0ce2ecb3 github.com/intel/ipu6-drivers)
Signed-off-by: You-Sheng Yang <vicamo.yang@canonical.com>
Acked-by: Andrea Righi <andrea.righi@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
drivers/media/pci/intel/ipu-bus.c

index 084aa5f946d0cdfd014361f292a2ff664e8680a5..d3b7f44c0e8a0401b342639ded5bb9fb9f48ace0 100644 (file)
@@ -119,15 +119,13 @@ out_err:
        return rval;
 }
 
-static int ipu_bus_remove(struct device *dev)
+static void ipu_bus_remove(struct device *dev)
 {
        struct ipu_bus_device *adev = to_ipu_bus_device(dev);
        struct ipu_bus_driver *adrv = to_ipu_bus_driver(dev->driver);
 
        if (adrv->remove)
                adrv->remove(adev);
-
-       return 0;
 }
 
 static struct bus_type ipu_bus = {