diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
| commit | aa11d958d1a6572eda08214d7c6a735804fe48a5 (patch) | |
| tree | d025b05270ad1e010660d17eeadc6ac3c1abbd7d /lib/dynamic_debug.c | |
| parent | 07f6642ee9418e962e54cbc07471cfe2e559c568 (diff) | |
| parent | 9799218ae36910af50f002a5db1802d576fffb43 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
arch/microblaze/include/asm/socket.h
Diffstat (limited to 'lib/dynamic_debug.c')
| -rw-r--r-- | lib/dynamic_debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 833139ce1e22..e22c148e4b7f 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c | |||
| @@ -164,7 +164,7 @@ static void ddebug_change(const struct ddebug_query *query, | |||
| 164 | 164 | ||
| 165 | if (!newflags) | 165 | if (!newflags) |
| 166 | dt->num_enabled--; | 166 | dt->num_enabled--; |
| 167 | else if (!dp-flags) | 167 | else if (!dp->flags) |
| 168 | dt->num_enabled++; | 168 | dt->num_enabled++; |
| 169 | dp->flags = newflags; | 169 | dp->flags = newflags; |
| 170 | if (newflags) { | 170 | if (newflags) { |