From ee356e34e2c7ded10dc59ea92b7b129f94cfbeb3 Mon Sep 17 00:00:00 2001 From: Sebastian Ott Date: Fri, 11 Sep 2009 10:28:24 +0200 Subject: [PATCH] --- yaml --- r: 157437 b: refs/heads/master c: ab6aae09024be1b039df441fa1b64dbe092d0acb h: refs/heads/master i: 157435: 801e98db353ba66d93fdc13265fe9bc37babb557 v: v3 --- [refs] | 2 +- trunk/drivers/s390/cio/cio.c | 5 ----- trunk/drivers/s390/cio/css.c | 5 +++++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 7720007ddb85..934b1a56b8f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f014824ee72e66292c3b1172dc142f959b42e61b +refs/heads/master: ab6aae09024be1b039df441fa1b64dbe092d0acb diff --git a/trunk/drivers/s390/cio/cio.c b/trunk/drivers/s390/cio/cio.c index 390b4e96fd0d..fe18ef691bb7 100644 --- a/trunk/drivers/s390/cio/cio.c +++ b/trunk/drivers/s390/cio/cio.c @@ -564,11 +564,6 @@ int cio_validate_subchannel(struct subchannel *sch, struct subchannel_id schid) goto out; } mutex_init(&sch->reg_mutex); - /* Set a name for the subchannel */ - if (cio_is_console(schid)) - sch->dev.init_name = cio_get_console_sch_name(schid); - else - dev_set_name(&sch->dev, "0.%x.%04x", schid.ssid, schid.sch_no); /* * The first subchannel that is not-operational (ccode==3) diff --git a/trunk/drivers/s390/cio/css.c b/trunk/drivers/s390/cio/css.c index 40d4b3093b71..0dc6f6d26287 100644 --- a/trunk/drivers/s390/cio/css.c +++ b/trunk/drivers/s390/cio/css.c @@ -183,6 +183,11 @@ static int css_sch_device_register(struct subchannel *sch) int ret; mutex_lock(&sch->reg_mutex); + if (cio_is_console(sch->schid)) + sch->dev.init_name = cio_get_console_sch_name(sch->schid); + else + dev_set_name(&sch->dev, "0.%x.%04x", sch->schid.ssid, + sch->schid.sch_no); ret = device_register(&sch->dev); mutex_unlock(&sch->reg_mutex); return ret;