diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-03-20 13:40:54 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-03-21 13:35:38 +0100 |
| commit | 94f9852de86447088e8e3c12d8b5a8f996acee32 (patch) | |
| tree | f0d6af4c34f51b52ce112b6adc1aee534bcbaa2c | |
| parent | 3bff6038f1938d2541943dfde604a9b92f347650 (diff) | |
| download | linux-3.10-94f9852de86447088e8e3c12d8b5a8f996acee32.tar.gz linux-3.10-94f9852de86447088e8e3c12d8b5a8f996acee32.tar.bz2 linux-3.10-94f9852de86447088e8e3c12d8b5a8f996acee32.zip | |
s390/scm_blk: fix error return code in scm_blk_init()
Fix to return a negative error code from the error handling
case instead of 0, as returned elsewhere in this function.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
| -rw-r--r-- | drivers/s390/block/scm_blk.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/s390/block/scm_blk.c b/drivers/s390/block/scm_blk.c index 713f0185f96..e9b9c839283 100644 --- a/drivers/s390/block/scm_blk.c +++ b/drivers/s390/block/scm_blk.c @@ -463,12 +463,15 @@ static int __init scm_blk_init(void) goto out; scm_major = ret; - if (scm_alloc_rqs(nr_requests)) + ret = scm_alloc_rqs(nr_requests); + if (ret) goto out_unreg; scm_debug = debug_register("scm_log", 16, 1, 16); - if (!scm_debug) + if (!scm_debug) { + ret = -ENOMEM; goto out_free; + } debug_register_view(scm_debug, &debug_hex_ascii_view); debug_set_level(scm_debug, 2); |