From ab5facb2eed82e9cbe7f500a7c6e80d5eb8d6fb9 Mon Sep 17 00:00:00 2001 From: Ursula Braun Date: Wed, 29 Aug 2007 11:26:52 +0200 Subject: [PATCH] --- yaml --- r: 64663 b: refs/heads/master c: d0a34f98d1da66a5b4e02171854e6c04c9916016 h: refs/heads/master i: 64661: 2d182746b8e98132746ce9cb9364be4821305b70 64659: f56701cfb1211b1b543e45cf5a88ebeeeebb5dbf 64655: fe75b4b840c072f018d65b68e104e3c39216c9eb v: v3 --- [refs] | 2 +- trunk/drivers/s390/net/qeth_main.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 839ca28c2725..3299d78d0bf4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3052246c815fe17ff3a9fcb5601c6688b523e5f5 +refs/heads/master: d0a34f98d1da66a5b4e02171854e6c04c9916016 diff --git a/trunk/drivers/s390/net/qeth_main.c b/trunk/drivers/s390/net/qeth_main.c index 57f69434fbf9..ba10d42a1a56 100644 --- a/trunk/drivers/s390/net/qeth_main.c +++ b/trunk/drivers/s390/net/qeth_main.c @@ -561,7 +561,7 @@ qeth_set_offline(struct ccwgroup_device *cgdev) } static int -qeth_wait_for_threads(struct qeth_card *card, unsigned long threads); +qeth_threads_running(struct qeth_card *card, unsigned long threads); static void @@ -576,8 +576,7 @@ qeth_remove_device(struct ccwgroup_device *cgdev) if (!card) return; - if (qeth_wait_for_threads(card, 0xffffffff)) - return; + wait_event(card->wait_q, qeth_threads_running(card, 0xffffffff) == 0); if (cgdev->state == CCWGROUP_ONLINE){ card->use_hard_stop = 1;