diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-21 09:33:25 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-21 09:33:25 +0100 |
| commit | 93929ebc813e2bbb768676ed13a1661893631504 (patch) | |
| tree | b22e6e45ea149e02d2fbe2e29b38db0bfa98f32b /net | |
| parent | ALSA: hda - Add alc_codec_rename() helper (diff) | |
| parent | ALSA: hda - Add PCI quirk for HP dv6-1110ax. (diff) | |
| download | linux-93929ebc813e2bbb768676ed13a1661893631504.tar.xz linux-93929ebc813e2bbb768676ed13a1661893631504.zip | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/xprtsock.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 75ab08eac66b..e4839c07c913 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -548,8 +548,6 @@ static int xs_udp_send_request(struct rpc_task *task) /* Still some bytes left; set up for a retry later. */ status = -EAGAIN; } - if (!transport->sock) - goto out; switch (status) { case -ENOTSOCK: @@ -569,7 +567,7 @@ static int xs_udp_send_request(struct rpc_task *task) * prompts ECONNREFUSED. */ clear_bit(SOCK_ASYNC_NOSPACE, &transport->sock->flags); } -out: + return status; } @@ -651,8 +649,6 @@ static int xs_tcp_send_request(struct rpc_task *task) status = -EAGAIN; break; } - if (!transport->sock) - goto out; switch (status) { case -ENOTSOCK: @@ -672,7 +668,7 @@ static int xs_tcp_send_request(struct rpc_task *task) case -ENOTCONN: clear_bit(SOCK_ASYNC_NOSPACE, &transport->sock->flags); } -out: + return status; } |