public inbox for linux-m68k@lists.linux-m68k.org
 help / color / mirror / Atom feed
From: Michael Schmitz <schmitzmic@gmail.com>
To: linux-m68k@vger.kernel.org
Cc: geert@linux-m68k.org, JBottomley@parallels.com,
	linux-scsi@vger.kernel.org, arnd@arndb.de,
	Michael Schmitz <schmitz@debian.org>
Subject: [PATCH 1/3] m68k/atari - atari_scsi: fix wait_event completion conditions
Date: Wed, 29 Jan 2014 12:55:22 +1300	[thread overview]
Message-ID: <1390953324-19962-2-git-send-email-schmitz@debian.org> (raw)
In-Reply-To: <1388664474-1710039-3-git-send-email-arnd@arndb.de>

Fix patch by ArndB changing falcon_get_lock to use wait_event.
Some of the completion conditions had been missed when converting
from while() {} to do {} until() logic.

Signed-off-by: Michael Schmitz <schmitz@debian.org>
---
 drivers/scsi/atari_scsi.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c
index 1986ecb..cc1b013 100644
--- a/drivers/scsi/atari_scsi.c
+++ b/drivers/scsi/atari_scsi.c
@@ -550,10 +550,10 @@ static void falcon_get_lock(void)
 
 	local_irq_save(flags);
 
-       wait_event_cmd(falcon_fairness_wait,
-                      !in_irq() && falcon_got_lock && stdma_others_waiting(),
-                      local_irq_restore(flags),
-                      local_irq_save(flags));
+	wait_event_cmd(falcon_fairness_wait,
+		in_irq() || !falcon_got_lock || !stdma_others_waiting(),
+		local_irq_restore(flags),
+		local_irq_save(flags));
 
 	while (!falcon_got_lock) {
 		if (in_irq())
@@ -566,9 +566,9 @@ static void falcon_get_lock(void)
 			wake_up(&falcon_try_wait);
 		} else {
                        wait_event_cmd(falcon_try_wait,
-                                      !falcon_got_lock && !falcon_trying_lock,
-                                      local_irq_restore(flags),
-                                      local_irq_save(flags));
+				falcon_got_lock && !falcon_trying_lock,
+				local_irq_restore(flags),
+				local_irq_save(flags));
 		}
 	}
 
-- 
1.7.0.4


  parent reply	other threads:[~2014-01-28 23:55 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1388664474-1710039-1-git-send-email-arnd@arndb.de>
     [not found] ` <1388664474-1710039-2-git-send-email-arnd@arndb.de>
2014-01-02 12:27   ` Fwd: [PATCH, RFC 01/30] ataflop: fix sleep_on races Geert Uytterhoeven
2014-01-05  1:39     ` Michael Schmitz
     [not found] ` <1388664474-1710039-15-git-send-email-arnd@arndb.de>
2014-01-02 12:27   ` Fwd: [PATCH, RFC 14/30] tty/amiserial: avoid interruptible_sleep_on Geert Uytterhoeven
     [not found] ` <1388664474-1710039-3-git-send-email-arnd@arndb.de>
2014-01-02 12:26   ` Fwd: [PATCH, RFC 02/30] scsi: atari_scsi: fix sleep_on race Geert Uytterhoeven
2014-01-05  1:35     ` Michael Schmitz
2014-01-12  1:40       ` Michael Schmitz
2014-01-12 20:00         ` Arnd Bergmann
2014-01-13  7:35           ` Michael Schmitz
2014-01-27  8:28           ` Michael Schmitz
2014-01-29 14:53             ` Arnd Bergmann
2014-01-30  7:54               ` schmitz
2014-01-30  7:57             ` Geert Uytterhoeven
2014-01-30  8:08               ` schmitz
2014-01-30  8:27                 ` Geert Uytterhoeven
2014-01-30  8:06             ` schmitz
2014-01-13  8:20         ` schmitz
2014-01-14  8:29         ` Michael Schmitz
2014-01-19 22:04           ` Michael Schmitz
2014-01-28  7:52     ` [PATCH 0/3] m68k/atari - Atari NCR5380 SCSI driver fixes Michael Schmitz
2014-01-28  8:02       ` Geert Uytterhoeven
2014-01-28  7:52     ` [PATCH 1/3] m68k/atari - atari_scsi: fix wait_event completion conditions Michael Schmitz
2014-01-28  7:52     ` [PATCH 2/3] m68k/atari - atari_scsi: change abort/reset return codes Michael Schmitz
2014-01-28  7:52     ` [PATCH 3/3] m68k/atari - atari_scsi lock fixes: punt if deadlocked Michael Schmitz
2014-01-28 23:55   ` [PATCH 0/3] m68k/atari - Atari NCR5380 SCSI driver fixes (resent) Michael Schmitz
2014-01-28 23:55   ` Michael Schmitz [this message]
2014-01-28 23:55   ` [PATCH 2/3] m68k/atari - atari_scsi: change abort/reset return codes Michael Schmitz
2014-01-28 23:55   ` [PATCH 3/3] m68k/atari - atari_scsi lock fixes: punt if deadlocked Michael Schmitz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1390953324-19962-2-git-send-email-schmitz@debian.org \
    --to=schmitzmic@gmail.com \
    --cc=JBottomley@parallels.com \
    --cc=arnd@arndb.de \
    --cc=geert@linux-m68k.org \
    --cc=linux-m68k@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=schmitz@debian.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox