From 630dd60c2924860e745287d7a1b2dabdb5306261 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Wed, 20 Mar 2013 13:40:54 +0100 Subject: [PATCH] --- yaml --- r: 362162 b: refs/heads/master c: 94f9852de86447088e8e3c12d8b5a8f996acee32 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/s390/block/scm_blk.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1d2e2b184a50..2342b1703267 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3bff6038f1938d2541943dfde604a9b92f347650 +refs/heads/master: 94f9852de86447088e8e3c12d8b5a8f996acee32 diff --git a/trunk/drivers/s390/block/scm_blk.c b/trunk/drivers/s390/block/scm_blk.c index 713f0185f96d..e9b9c8392832 100644 --- a/trunk/drivers/s390/block/scm_blk.c +++ b/trunk/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);