diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-06-02 08:15:10 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-06-02 08:15:10 -0400 |
commit | e4caa8bab3862a7694ab7c6dfede223227ad7fc5 (patch) | |
tree | 9fa537a72f00f6b4f86c2da7be2e9554304a8ec4 /fs/afs/server.c | |
parent | 9f75c1b12c5ef392ddcea575b13560842c28b1b3 (diff) | |
parent | edb39935c8b19fcd9a8f619d0bc1e9d04594cd2b (diff) |
Merge branch 'master' of git.alsa-project.org:alsa-kernel into fix/hda
Diffstat (limited to 'fs/afs/server.c')
-rw-r--r-- | fs/afs/server.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/afs/server.c b/fs/afs/server.c index f49099516675..9fdc7fe3a7bc 100644 --- a/fs/afs/server.c +++ b/fs/afs/server.c | |||
@@ -91,9 +91,10 @@ static struct afs_server *afs_alloc_server(struct afs_cell *cell, | |||
91 | 91 | ||
92 | memcpy(&server->addr, addr, sizeof(struct in_addr)); | 92 | memcpy(&server->addr, addr, sizeof(struct in_addr)); |
93 | server->addr.s_addr = addr->s_addr; | 93 | server->addr.s_addr = addr->s_addr; |
94 | _leave(" = %p{%d}", server, atomic_read(&server->usage)); | ||
95 | } else { | ||
96 | _leave(" = NULL [nomem]"); | ||
94 | } | 97 | } |
95 | |||
96 | _leave(" = %p{%d}", server, atomic_read(&server->usage)); | ||
97 | return server; | 98 | return server; |
98 | } | 99 | } |
99 | 100 | ||