From 0fcab289e1134d4208fef05147b99dc500f0b600 Mon Sep 17 00:00:00 2001 From: Peter Senna Tschudin Date: Mon, 17 Sep 2012 10:12:00 +0200 Subject: [PATCH] --- yaml --- r: 324115 b: refs/heads/master c: 72abaadf25f2bc6098740622e4ed526775b197f9 h: refs/heads/master i: 324113: 381d74b60d46caf261611da172557cb203daaf45 324111: 9f3ae9f5f1fbeb0e4917aba65e6cefc78b8707c3 v: v3 --- [refs] | 2 +- trunk/drivers/s390/char/monreader.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 12e02bee4521..c6974b0da750 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1d6b40cbd0d6ff475b6a0a7a807a1e3bee7c033 +refs/heads/master: 72abaadf25f2bc6098740622e4ed526775b197f9 diff --git a/trunk/drivers/s390/char/monreader.c b/trunk/drivers/s390/char/monreader.c index 5b8b8592d311..f4ff515db251 100644 --- a/trunk/drivers/s390/char/monreader.c +++ b/trunk/drivers/s390/char/monreader.c @@ -571,8 +571,11 @@ static int __init mon_init(void) if (rc) goto out_iucv; monreader_device = kzalloc(sizeof(struct device), GFP_KERNEL); - if (!monreader_device) + if (!monreader_device) { + rc = -ENOMEM; goto out_driver; + } + dev_set_name(monreader_device, "monreader-dev"); monreader_device->bus = &iucv_bus; monreader_device->parent = iucv_root;