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/con3215.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/con3215.c')
-rw-r--r-- | drivers/s390/char/con3215.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c index f25c6d116f6f..2fa566fa6da4 100644 --- a/drivers/s390/char/con3215.c +++ b/drivers/s390/char/con3215.c @@ -693,7 +693,7 @@ raw3215_probe (struct ccw_device *cdev) GFP_KERNEL|GFP_DMA); if (raw->buffer == NULL) { spin_lock(&raw3215_device_lock); - raw3215[line] = 0; + raw3215[line] = NULL; spin_unlock(&raw3215_device_lock); kfree(raw); return -ENOMEM; |