diff options
| author | Jens Axboe <axboe@fb.com> | 2017-02-07 16:17:22 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-02-07 16:17:22 -0700 |
| commit | 2200d872cf1ddd0e3f6f5b1d7d2c91f05235d721 (patch) | |
| tree | d6903b1cdeb5d0246f5a50c2f1b3356fcd0af040 | |
| parent | d8be8b7ee23a12c16b0738981f9d4940f6bc91e8 (diff) | |
| parent | 605cdf0875f80300be47e79bd91b2d60916407d3 (diff) | |
Merge branch 'for-4.11/block' into for-next
| -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 b6f1a5d95bc5..bc316d288f65 100644 --- a/drivers/cdrom/gdrom.c +++ b/drivers/cdrom/gdrom.c @@ -808,16 +808,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; |