瀏覽代碼

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>
Christophe JAILLET 8 年之前
父節點
當前提交
605cdf0875
共有 1 個文件被更改,包括 6 次插入2 次删除
  1. 6 2
      drivers/cdrom/gdrom.c

+ 6 - 2
drivers/cdrom/gdrom.c

@@ -807,16 +807,20 @@ static int probe_gdrom(struct platform_device *devptr)
 	if (err)
 	if (err)
 		goto probe_fail_cmdirq_register;
 		goto probe_fail_cmdirq_register;
 	gd.gdrom_rq = blk_init_queue(gdrom_request, &gdrom_lock);
 	gd.gdrom_rq = blk_init_queue(gdrom_request, &gdrom_lock);
-	if (!gd.gdrom_rq)
+	if (!gd.gdrom_rq) {
+		err = -ENOMEM;
 		goto probe_fail_requestq;
 		goto probe_fail_requestq;
+	}
 
 
 	err = probe_gdrom_setupqueue();
 	err = probe_gdrom_setupqueue();
 	if (err)
 	if (err)
 		goto probe_fail_toc;
 		goto probe_fail_toc;
 
 
 	gd.toc = kzalloc(sizeof(struct gdromtoc), GFP_KERNEL);
 	gd.toc = kzalloc(sizeof(struct gdromtoc), GFP_KERNEL);
-	if (!gd.toc)
+	if (!gd.toc) {
+		err = -ENOMEM;
 		goto probe_fail_toc;
 		goto probe_fail_toc;
+	}
 	add_disk(gd.disk);
 	add_disk(gd.disk);
 	return 0;
 	return 0;