Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[pandora-kernel.git] / drivers / scsi / iscsi_tcp.c

diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index cdb4fd8..7608310 100644 (file)
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -601,9 +601,9 @@ 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 (sock->sk->sk_sleep) {
+       if (sk_sleep(sock->sk) && waitqueue_active(sk_sleep(sock->sk))) {
                sock->sk->sk_err = EIO;
-               wake_up_interruptible(sock->sk->sk_sleep);
+               wake_up_interruptible(sk_sleep(sock->sk));
        }
 
        iscsi_conn_stop(cls_conn, flag);