aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/cdrom/gdrom.c
diff options
context:
space:
mode:
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2017-02-06 17:00:13 -0500
committerJens Axboe <axboe@fb.com>2017-02-07 18:17:16 -0500
commit605cdf0875f80300be47e79bd91b2d60916407d3 (patch)
tree420d97001cf1e8bbf6a1ec283c7c05c5d54d57e5 /drivers/cdrom/gdrom.c
parent8c87fe722053658467bcc9e5ea82051ce3d3a693 (diff)
gdrom: Add missing error code
In case of error, 'err' is known to be 0 here, because of the previous test. Set it to a -ENOMEM instead. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/cdrom/gdrom.c')
-rw-r--r--drivers/cdrom/gdrom.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index 584bc3126403..46ecd95d7161 100644
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -807,16 +807,20 @@ static int probe_gdrom(struct platform_device *devptr)
807 if (err) 807 if (err)
808 goto probe_fail_cmdirq_register; 808 goto probe_fail_cmdirq_register;
809 gd.gdrom_rq = blk_init_queue(gdrom_request, &gdrom_lock); 809 gd.gdrom_rq = blk_init_queue(gdrom_request, &gdrom_lock);
810 if (!gd.gdrom_rq) 810 if (!gd.gdrom_rq) {
811 err = -ENOMEM;
811 goto probe_fail_requestq; 812 goto probe_fail_requestq;
813 }
812 814
813 err = probe_gdrom_setupqueue(); 815 err = probe_gdrom_setupqueue();
814 if (err) 816 if (err)
815 goto probe_fail_toc; 817 goto probe_fail_toc;
816 818
817 gd.toc = kzalloc(sizeof(struct gdromtoc), GFP_KERNEL); 819 gd.toc = kzalloc(sizeof(struct gdromtoc), GFP_KERNEL);
818 if (!gd.toc) 820 if (!gd.toc) {
821 err = -ENOMEM;
819 goto probe_fail_toc; 822 goto probe_fail_toc;
823 }
820 add_disk(gd.disk); 824 add_disk(gd.disk);
821 return 0; 825 return 0;
822 826