From 3955c2f01f0f75c27c20e098d2a8547e0c601b36 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 May 2010 10:48:32 -0700
Subject: [PATCH] --- yaml --- r: 196071 b: refs/heads/master c:
 d6fb1db02e02aea98f2d7e121fd30e24c84639d6 h: refs/heads/master i:   196069:
 158ae68ccf4fb663b5bd50513c44df77342e7e41   196067:
 d39c5e758c82fa991b49014cce40ad1203256b0b   196063:
 5a2930f23abf9a9dcb7ae5c409f3c747f51e2f41 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/scsi/iscsi_tcp.c  | 2 +-
 trunk/include/linux/interrupt.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b728dea4eed7..a9d7bf2557f4 100644
--- 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
index 7608310e19ee..bf55d3057413 100644
--- 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
index 5137db3317f9..c2331138ca1b 100644
--- 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.
  *