diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2017-02-06 23:00:13 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-02-07 16:17:16 -0700 |
| commit | 605cdf0875f80300be47e79bd91b2d60916407d3 (patch) | |
| tree | 420d97001cf1e8bbf6a1ec283c7c05c5d54d57e5 /drivers/cdrom | |
| parent | 8c87fe722053658467bcc9e5ea82051ce3d3a693 (diff) | |
| download | linux-stable-605cdf0875f80300be47e79bd91b2d60916407d3.tar.gz linux-stable-605cdf0875f80300be47e79bd91b2d60916407d3.tar.bz2 linux-stable-605cdf0875f80300be47e79bd91b2d60916407d3.zip | |
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')
| -rw-r--r-- | drivers/cdrom/gdrom.c | 8 |
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) if (err) goto probe_fail_cmdirq_register; gd.gdrom_rq = blk_init_queue(gdrom_request, &gdrom_lock); - if (!gd.gdrom_rq) + if (!gd.gdrom_rq) { + err = -ENOMEM; goto probe_fail_requestq; + } err = probe_gdrom_setupqueue(); if (err) goto probe_fail_toc; gd.toc = kzalloc(sizeof(struct gdromtoc), GFP_KERNEL); - if (!gd.toc) + if (!gd.toc) { + err = -ENOMEM; goto probe_fail_toc; + } add_disk(gd.disk); return 0; |