]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
UBUNTU: hio -- device_add_disk() grew a 'groups' argument in 4.20
authorSeth Forshee <seth.forshee@canonical.com>
Wed, 6 Feb 2019 21:22:21 +0000 (15:22 -0600)
committerAndrea Righi <andrea.righi@canonical.com>
Mon, 15 Feb 2021 07:25:42 +0000 (08:25 +0100)
We can just pass NULL for this new argument.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
ubuntu/hio/hio.c

index f5f601802f498fc8568556795ed3c4af44510fe8..57ad49a7e5621db9ab377e6e65c3d3dbc41d16b2 100644 (file)
@@ -10474,7 +10474,9 @@ static int ssd_init_blkdev(struct ssd_device *dev)
 
        set_capacity(dev->gd, dev->hw_info.size >> 9);
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0))
+       device_add_disk(&dev->pdev->dev, dev->gd, NULL);
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0))
        device_add_disk(&dev->pdev->dev, dev->gd);
 #else
        dev->gd->driverfs_dev = &dev->pdev->dev;