diff options
author | Linus Torvalds | 2006-07-12 17:30:57 +0200 |
---|---|---|
committer | Linus Torvalds | 2006-07-12 17:30:57 +0200 |
commit | b2d6744849b5bf6b4593b81c136772df7a238ac9 (patch) | |
tree | f27260a0b16412449c4205207af114646c29e2c4 /drivers/s390/char/keyboard.c | |
parent | Add PIIX4 APCI quirk for the 440MX chipset too (diff) | |
parent | [S390] Fix sparse warnings. (diff) | |
download | kernel-qcow2-linux-b2d6744849b5bf6b4593b81c136772df7a238ac9.tar.gz kernel-qcow2-linux-b2d6744849b5bf6b4593b81c136772df7a238ac9.tar.xz kernel-qcow2-linux-b2d6744849b5bf6b4593b81c136772df7a238ac9.zip |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] Fix sparse warnings.
[S390] path grouping and path verifications fixes.
[S390] xpram module parameter parsing.
[S390] cpu_relax() is supposed to have barrier() semantics.
[S390] fix futex_atomic_cmpxchg_inatomic
[S390] subchannel register/unregister mutex.
[S390] raw_local_save_flags/raw_local_irq_restore type check
[S390] __builtin_trap() and gcc version.
Diffstat (limited to 'drivers/s390/char/keyboard.c')
-rw-r--r-- | drivers/s390/char/keyboard.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/s390/char/keyboard.c b/drivers/s390/char/keyboard.c index 547ef906ae2c..3be06569180d 100644 --- a/drivers/s390/char/keyboard.c +++ b/drivers/s390/char/keyboard.c @@ -103,7 +103,7 @@ out_maps: out_kbd: kfree(kbd); out: - return 0; + return NULL; } void @@ -304,7 +304,7 @@ kbd_keycode(struct kbd_data *kbd, unsigned int keycode) if (kbd->sysrq) { if (kbd->sysrq == K(KT_LATIN, '-')) { kbd->sysrq = 0; - handle_sysrq(value, 0, kbd->tty); + handle_sysrq(value, NULL, kbd->tty); return; } if (value == '-') { @@ -363,7 +363,7 @@ do_kdsk_ioctl(struct kbd_data *kbd, struct kbentry __user *user_kbe, /* disallocate map */ key_map = kbd->key_maps[tmp.kb_table]; if (key_map) { - kbd->key_maps[tmp.kb_table] = 0; + kbd->key_maps[tmp.kb_table] = NULL; kfree(key_map); } break; |