Merge tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[deliverable/linux.git] / drivers / char / bsr.c

diff --git a/drivers/char/bsr.c b/drivers/char/bsr.c
index 0c688232aab3596824cd37ce4f1c6b0a4f90a351..97467053a01b0aa381413f75e02d19f242ddb814 100644 (file)
--- a/drivers/char/bsr.c
+++ b/drivers/char/bsr.c
@@ -297,7 +297,6 @@ static int __init bsr_init(void)
        struct device_node *np;
        dev_t bsr_dev;
        int ret = -ENODEV;
-       int result;
 
        np = of_find_compatible_node(NULL, NULL, "ibm,bsr");
        if (!np)
@@ -306,13 +305,14 @@ static int __init bsr_init(void)
        bsr_class = class_create(THIS_MODULE, "bsr");
        if (IS_ERR(bsr_class)) {
                printk(KERN_ERR "class_create() failed for bsr_class\n");
+               ret = PTR_ERR(bsr_class);
                goto out_err_1;
        }
        bsr_class->dev_attrs = bsr_dev_attrs;
 
-       result = alloc_chrdev_region(&bsr_dev, 0, BSR_MAX_DEVS, "bsr");
+       ret = alloc_chrdev_region(&bsr_dev, 0, BSR_MAX_DEVS, "bsr");
        bsr_major = MAJOR(bsr_dev);
-       if (result < 0) {
+       if (ret < 0) {
                printk(KERN_ERR "alloc_chrdev_region() failed for bsr\n");
                goto out_err_2;
        }