diff --git a/[refs] b/[refs] index cc7d5dfa9382..1d174bb28b1a 100644 --- 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 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)); }