diff options
| author | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2009-09-21 05:09:22 -0400 |
|---|---|---|
| committer | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2009-09-21 05:09:22 -0400 |
| commit | 7cce2f4cb7f5f641f78c8e3eea4e7b1b96cb71c0 (patch) | |
| tree | b064d077928cf224660ab1e1841cdab2c9fd8b08 /lib/dynamic_debug.c | |
| parent | e055f7e873d900925c222cf2d1ec955af4a9ca90 (diff) | |
| parent | ebc79c4f8da0f92efa968e0328f32334a2ce80cf (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into linux-next
Conflicts:
fs/ubifs/super.c
Merge the upstream tree in order to resolve a conflict with the
per-bdi writeback changes from the linux-2.6-block tree.
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) { |