Merge tag 'stackleak-v4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / cdrom / gdrom.c

diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index 757e85b..a5b8afe 100644 (file)
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -327,15 +327,15 @@ static int get_entry_track(int track)
 static int gdrom_get_last_session(struct cdrom_device_info *cd_info,
        struct cdrom_multisession *ms_info)
 {
-       int fentry, lentry, track, data, tocuse, err;
+       int fentry, lentry, track, data, err;
+
        if (!gd.toc)
                return -ENOMEM;
-       tocuse = 1;
+
        /* Check if GD-ROM */
        err = gdrom_readtoc_cmd(gd.toc, 1);
        /* Not a GD-ROM so check if standard CD-ROM */
        if (err) {
-               tocuse = 0;
                err = gdrom_readtoc_cmd(gd.toc, 0);
                if (err) {
                        pr_info("Could not get CD table of contents\n");
@@ -794,7 +794,7 @@ static int probe_gdrom(struct platform_device *devptr)
        gd.gdrom_rq = blk_mq_init_sq_queue(&gd.tag_set, &gdrom_mq_ops, 1,
                                BLK_MQ_F_SHOULD_MERGE | BLK_MQ_F_BLOCKING);
        if (IS_ERR(gd.gdrom_rq)) {
-               rc = PTR_ERR(gd.gdrom_rq);
+               err = PTR_ERR(gd.gdrom_rq);
                gd.gdrom_rq = NULL;
                goto probe_fail_requestq;
        }