diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
| commit | b10778a00d40b3d9fdaaf5891e802794781ff71c (patch) | |
| tree | 6ba4cbac86eecedc3f30650e7f764ecf00c83898 /net/9p/client.c | |
| parent | 594081ee7145cc30a3977cb4e218f81213b63dc5 (diff) | |
| parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) | |
Merge commit 'v3.17' into next
Diffstat (limited to 'net/9p/client.c')
| -rw-r--r-- | net/9p/client.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/9p/client.c b/net/9p/client.c index 0004cbaac4a4..e86a9bea1d16 100644 --- a/net/9p/client.c +++ b/net/9p/client.c | |||
| @@ -959,7 +959,6 @@ static int p9_client_version(struct p9_client *c) | |||
| 959 | break; | 959 | break; |
| 960 | default: | 960 | default: |
| 961 | return -EINVAL; | 961 | return -EINVAL; |
| 962 | break; | ||
| 963 | } | 962 | } |
| 964 | 963 | ||
| 965 | if (IS_ERR(req)) | 964 | if (IS_ERR(req)) |