---

yaml --- r: 196031 b: refs/heads/master c: 70ca0a4 h: refs/heads/master i: 196029: 2caa695 196027: 285b729 196023: 527102a 196015: b876d7e 195999: 164487b 195967: ca19922 v: v3
git-mirror · May 21, 2010 · 00463a6 · 00463a6
1 parent 296cb69
commit 00463a6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7dbf4ffee1c7a17e2e5b5f01efe76fbd1671db6
+refs/heads/master: 70ca0a42fe1702ac0784386c44b05d18ee5f1f9e
diff --git a/trunk/drivers/scsi/iscsi_tcp.c b/trunk/drivers/scsi/iscsi_tcp.c
@@ -601,7 +601,7 @@ static void iscsi_sw_tcp_conn_stop(struct iscsi_cls_conn *cls_conn, int flag)
 	set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_rx);
 	write_unlock_bh(&tcp_sw_conn->sock->sk->sk_callback_lock);
 
-	if (sk_sleep(sock->sk) && waitqueue_active(sk_sleep(sock->sk))) {
+	if (sk_sleep(sock->sk)) {
 		sock->sk->sk_err = EIO;
 		wake_up_interruptible(sk_sleep(sock->sk));
 	}