---

yaml --- r: 196071 b: refs/heads/master c: d6fb1db h: refs/heads/master i: 196069: 158ae68 196067: d39c5e7 196063: 5a2930f v: v3
git-mirror · May 21, 2010 · 3955c2f · 3955c2f
1 parent 74f1db7
commit 3955c2f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1b3f594dc5faab91d3a218c7019e9b5edd9fe1a
+refs/heads/master: d6fb1db02e02aea98f2d7e121fd30e24c84639d6
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));
 	}

diff --git a/trunk/include/linux/interrupt.h b/trunk/include/linux/interrupt.h
@@ -78,7 +78,7 @@ enum {
 	IRQTF_AFFINITY,
 };
 
-/**
+/*
  * These values can be returned by request_any_context_irq() and
  * describe the context the interrupt will be run in.
  *
-Original file line number
+Diff line change
@@ Expand Up / @@ -78,7 +78,7 @@ enum { @@
     	IRQTF_AFFINITY,
     };
-    /**
+    /*
      * These values can be returned by request_any_context_irq() and
      * describe the context the interrupt will be run in.
      *
@@ Expand Down @@