git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
s390
/
char
/
con3215.c
diff --git
a/drivers/s390/char/con3215.c
b/drivers/s390/char/con3215.c
index
2fa566f
..
606f6ad
100644
(file)
--- a/
drivers/s390/char/con3215.c
+++ b/
drivers/s390/char/con3215.c
@@
-11,6
+11,7
@@
* Dan Morrison, IBM Corporation (dmorriso@cse.buffalo.edu)
*/
* Dan Morrison, IBM Corporation (dmorriso@cse.buffalo.edu)
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kdev_t.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kdev_t.h>
@@
-693,7
+694,7
@@
raw3215_probe (struct ccw_device *cdev)
GFP_KERNEL|GFP_DMA);
if (raw->buffer == NULL) {
spin_lock(&raw3215_device_lock);
GFP_KERNEL|GFP_DMA);
if (raw->buffer == NULL) {
spin_lock(&raw3215_device_lock);
- raw3215[line] =
NULL
;
+ raw3215[line] =
0
;
spin_unlock(&raw3215_device_lock);
kfree(raw);
return -ENOMEM;
spin_unlock(&raw3215_device_lock);
kfree(raw);
return -ENOMEM;