From 034e7228cdfba1b34f233b068c07e3ed7bf5ed0d Mon Sep 17 00:00:00 2001 From: Sebastian Ott Date: Thu, 25 Dec 2008 13:39:03 +0100 Subject: [PATCH] --- yaml --- r: 121385 b: refs/heads/master c: 111e95a4cae01d6dadbbd1d8ab28dcd10fa5619c h: refs/heads/master i: 121383: e8d1d1eafce16137caf5aa39a30947727a8bbce9 v: v3 --- [refs] | 2 +- trunk/drivers/s390/cio/device.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 854461093367..98da4e29f2c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7b604891b7ce7de93e3758ec6b3b7b7964e1884 +refs/heads/master: 111e95a4cae01d6dadbbd1d8ab28dcd10fa5619c diff --git a/trunk/drivers/s390/cio/device.c b/trunk/drivers/s390/cio/device.c index fac85160a753..fc0c0abd1271 100644 --- a/trunk/drivers/s390/cio/device.c +++ b/trunk/drivers/s390/cio/device.c @@ -1179,12 +1179,6 @@ static int io_subchannel_probe(struct subchannel *sch) return 0; } io_subchannel_init_fields(sch); - /* - * First check if a fitting device may be found amongst the - * disconnected devices or in the orphanage. - */ - dev_id.devno = sch->schib.pmcw.dev; - dev_id.ssid = sch->schid.ssid; rc = sysfs_create_group(&sch->dev.kobj, &io_subchannel_attr_group); if (rc) @@ -1196,6 +1190,12 @@ static int io_subchannel_probe(struct subchannel *sch) rc = -ENOMEM; goto out_err; } + /* + * First check if a fitting device may be found amongst the + * disconnected devices or in the orphanage. + */ + dev_id.devno = sch->schib.pmcw.dev; + dev_id.ssid = sch->schid.ssid; cdev = get_disc_ccwdev_by_dev_id(&dev_id, NULL); if (!cdev) cdev = get_orphaned_ccwdev_by_dev_id(to_css(sch->dev.parent),