Messages in this thread Patch in this message | | | Date | Thu, 26 Oct 2006 11:02:01 +0200 | From | Martin Schwidefsky <> | Subject | [S390] cio: css_probe_device() must be called enabled. |
| |
From: Cornelia Huck <cornelia.huck@de.ibm.com>
[S390] cio: css_probe_device() must be called enabled.
Move css_probe_device() behind giving up the lock for the old subchannel in css_evaluate_known_subchannel() so we aren't disabled when we call it.
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> ---
drivers/s390/cio/css.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)
diff -urpN linux-2.6/drivers/s390/cio/css.c linux-2.6-patched/drivers/s390/cio/css.c --- linux-2.6/drivers/s390/cio/css.c 2006-10-26 10:43:46.000000000 +0200 +++ linux-2.6-patched/drivers/s390/cio/css.c 2006-10-26 10:44:03.000000000 +0200 @@ -271,10 +271,6 @@ static int css_evaluate_known_subchannel /* 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 break; } spin_unlock_irqrestore(&sch->lock, flags); + /* Probe if necessary. */ + if (action == UNREGISTER_PROBE) + ret = css_probe_device(sch->schid); return ret; } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |