diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-25 12:32:18 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-25 12:32:18 +1000 |
| commit | 26edeb7e19cab5cff1e60b0a6f5f17a4b1581b66 (patch) | |
| tree | d1193f4bfadb907f1f0806f45abd54cbe2931598 /drivers | |
| parent | c89c53c87a53894d451c27cf9fee98d5e34b2ae3 (diff) | |
| parent | 93c47fada46e034941106fb34b76a00a87108fc5 (diff) | |
Merge remote branch 'kgdb/kgdb-next'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/sysrq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c index 5d15630a5830..d5a2e2f9287d 100644 --- a/drivers/char/sysrq.c +++ b/drivers/char/sysrq.c @@ -717,7 +717,7 @@ int sysrq_toggle_support(int enable_mask) sysrq_unregister_handler(); } - return 0; + return was_enabled; } static int __sysrq_swap_key_ops(int key, struct sysrq_key_op *insert_op_p, |