From d27f6cfb439104d64cb1703905842d5075ad2c7b Mon Sep 17 00:00:00 2001 From: Cornelia Huck Date: Fri, 27 Oct 2006 12:39:17 +0200 Subject: [PATCH] --- yaml --- r: 40424 b: refs/heads/master c: c2b1449bd1fd73103ed5ff1a28d8f7cbc8a01b52 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/s390/cio/css.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2d3fc5d772b3..9a81f23d4d85 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95425f19beed99cb9b0a79f69731eda907d9db99 +refs/heads/master: c2b1449bd1fd73103ed5ff1a28d8f7cbc8a01b52 diff --git a/trunk/drivers/s390/cio/css.c b/trunk/drivers/s390/cio/css.c index a2dee5bf5a17..ad7f7e1c0163 100644 --- a/trunk/drivers/s390/cio/css.c +++ b/trunk/drivers/s390/cio/css.c @@ -271,10 +271,6 @@ static int css_evaluate_known_subchannel(struct subchannel *sch, int slow) /* Reset intparm to zeroes. */ sch->schib.pmcw.intparm = 0; cio_modify(sch); - - /* Probe if necessary. */ - if (action == UNREGISTER_PROBE) - ret = css_probe_device(sch->schid); break; case REPROBE: device_trigger_reprobe(sch); @@ -283,6 +279,9 @@ static int css_evaluate_known_subchannel(struct subchannel *sch, int slow) break; } spin_unlock_irqrestore(&sch->lock, flags); + /* Probe if necessary. */ + if (action == UNREGISTER_PROBE) + ret = css_probe_device(sch->schid); return ret; }