we are getting dev_t as an argument in the function, so use the local
variable instead of the global variable "majordev".
this global variable will be removed in one of the next patch of the
series.

Signed-off-by: Sudip Mukherjee <su...@vectorindia.org>
---

v5: reordered the patch series
v4: messed up the subject in v3
v3: broke the previous patch in series

 drivers/staging/unisys/visorchipset/file.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/unisys/visorchipset/file.c 
b/drivers/staging/unisys/visorchipset/file.c
index b426762..6ebe7f7 100644
--- a/drivers/staging/unisys/visorchipset/file.c
+++ b/drivers/staging/unisys/visorchipset/file.c
@@ -57,16 +57,16 @@ visorchipset_file_init(dev_t major_dev, struct visorchannel 
**controlvm_channel)
        majordev = major_dev;
        cdev_init(&file_cdev, &visorchipset_fops);
        file_cdev.owner = THIS_MODULE;
-       if (MAJOR(majordev) == 0) {
+       if (MAJOR(major_dev) == 0) {
                /* dynamic major device number registration required */
-               if (alloc_chrdev_region(&majordev, 0, 1, MYDRVNAME) < 0)
+               if (alloc_chrdev_region(&major_dev, 0, 1, MYDRVNAME) < 0)
                        return -1;
        } else {
                /* static major device number registration required */
-               if (register_chrdev_region(majordev, 1, MYDRVNAME) < 0)
+               if (register_chrdev_region(major_dev, 1, MYDRVNAME) < 0)
                        return -1;
        }
-       rc = cdev_add(&file_cdev, MKDEV(MAJOR(majordev), 0), 1);
+       rc = cdev_add(&file_cdev, MKDEV(MAJOR(major_dev), 0), 1);
        if (rc  < 0)
                return -1;
        return 0;
-- 
1.8.1.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to