1 From 80c20ff00542b050733780ae6088e50663ee8d78 Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.org>
3 Date: Mon, 29 Jul 2019 12:03:21 +0100
4 Subject: [PATCH] driver: char: rpivid - also support legacy name
6 Provide transitional support for the previous names of
9 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
11 drivers/char/broadcom/rpivid-mem.c | 22 ++++++++++++++++++----
12 1 file changed, 18 insertions(+), 4 deletions(-)
14 --- a/drivers/char/broadcom/rpivid-mem.c
15 +++ b/drivers/char/broadcom/rpivid-mem.c
16 @@ -66,7 +66,7 @@ static int rpivid_mem_open(struct inode
17 int dev = iminor(inode);
19 struct rpivid_mem_priv *priv;
20 - if (dev != DEVICE_MINOR)
21 + if (dev != DEVICE_MINOR && dev != DEVICE_MINOR + 1)
24 priv = container_of(inode->i_cdev, struct rpivid_mem_priv,
25 @@ -82,7 +82,7 @@ static int rpivid_mem_release(struct ino
26 int dev = iminor(inode);
29 - if (dev != DEVICE_MINOR)
30 + if (dev != DEVICE_MINOR && dev != DEVICE_MINOR + 1)
34 @@ -167,14 +167,14 @@ static int rpivid_mem_probe(struct platf
35 /* Create character device entries */
37 err = alloc_chrdev_region(&priv->devid,
38 - DEVICE_MINOR, 1, priv->name);
39 + DEVICE_MINOR, 2, priv->name);
41 dev_err(priv->dev, "unable to allocate device number");
42 goto failed_alloc_chrdev;
44 cdev_init(&priv->rpivid_mem_cdev, &rpivid_mem_fops);
45 priv->rpivid_mem_cdev.owner = THIS_MODULE;
46 - err = cdev_add(&priv->rpivid_mem_cdev, priv->devid, 1);
47 + err = cdev_add(&priv->rpivid_mem_cdev, priv->devid, 2);
49 dev_err(priv->dev, "unable to register device");
51 @@ -194,6 +194,20 @@ static int rpivid_mem_probe(struct platf
53 goto failed_device_create;
57 + char *oldname = kstrdup(priv->name, GFP_KERNEL);
64 + (void)device_create(priv->class, NULL, priv->devid + 1, NULL,
69 dev_info(priv->dev, "%s initialised: Registers at 0x%08lx length 0x%08lx",
70 priv->name, priv->regs_phys, priv->mem_window_len);