Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/mfasheh...

[powerpc.git] / drivers / s390 / char / raw3270.h

diff --git a/drivers/s390/char/raw3270.h b/drivers/s390/char/raw3270.h
index b635bf8..90beaa8 100644 (file)
--- a/drivers/s390/char/raw3270.h
+++ b/drivers/s390/char/raw3270.h
@@ -231,7 +231,7 @@ alloc_string(struct list_head *free_list, unsigned long len)
                INIT_LIST_HEAD(&cs->update);
                return cs;
        }
-       return 0;
+       return NULL;
 }
 
 static inline unsigned long