shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

drivers: rk_nand: fix compile warning

Browse Source 
warning:
drivers/rk_nand/rk_nand_blk.c:559 nand_blk_register() warn:
missing error code 'ret'

Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I89c8358805da5db24b5ff91961a062dbdfcceead
This commit is contained in:
Yifeng Zhao
2022-06-06 14:23:51 +08:00
committed by Tao Huang
parent 63318e7269
commit b8ff8b1d30
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/rk_nand/rk_nand_blk.c
View File

@@ -539,12 +539,15 @@ static int nand_blk_register(struct nand_blk_ops *nand_ops)
nand_ops->quit = 0;
nand_ops->nand_th_quited = 0;
mtd_read_temp_buffer = kmalloc(MTD_RW_SECTORS * 512,
GFP_KERNEL | GFP_DMA);
ret = register_blkdev(nand_ops->major, nand_ops->name);
if (ret)
return -1;
return ret;
mtd_read_temp_buffer = kmalloc(MTD_RW_SECTORS * 512, GFP_KERNEL | GFP_DMA);
if (!mtd_read_temp_buffer) {
ret = -ENOMEM;
goto mtd_buffer_error;
}
init_completion(&nand_ops->thread_exit);
init_waitqueue_head(&nand_ops->thread_wq);
@@ -555,8 +558,10 @@ static int nand_blk_register(struct nand_blk_ops *nand_ops)
INIT_LIST_HEAD(&nand_ops->rq_list);
nand_ops->tag_set = kzalloc(sizeof(*nand_ops->tag_set), GFP_KERNEL);
if (!nand_ops->tag_set)
if (!nand_ops->tag_set) {
ret = -ENOMEM;
goto tag_set_error;
}
nand_ops->rq = blk_mq_init_sq_queue(nand_ops->tag_set, &rk_nand_mq_ops, 1,
BLK_MQ_F_SHOULD_MERGE | BLK_MQ_F_BLOCKING);
@@ -601,6 +606,9 @@ static int nand_blk_register(struct nand_blk_ops *nand_ops)
rq_init_error:
kfree(nand_ops->tag_set);
tag_set_error:
kfree(mtd_read_temp_buffer);
mtd_read_temp_buffer = NULL;
mtd_buffer_error:
unregister_blkdev(nand_ops->major, nand_ops->name);
return ret;