Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...

[deliverable/linux.git] / drivers / isdn / mISDN / l1oip_codec.c

diff --git a/drivers/isdn/mISDN/l1oip_codec.c b/drivers/isdn/mISDN/l1oip_codec.c
index 2ec4b28d9edc85aecf80c7007c3ea0f4038eb62a..bbfd1b863ed3da49f95138ed3389c2ba4336df05 100644 (file)
--- a/drivers/isdn/mISDN/l1oip_codec.c
+++ b/drivers/isdn/mISDN/l1oip_codec.c
@@ -48,6 +48,7 @@ NOTE: The bytes are handled as they are law-encoded.
 
 #include <linux/vmalloc.h>
 #include <linux/mISDNif.h>
+#include <linux/in.h>
 #include "core.h"
 #include "l1oip.h"
 
@@ -331,7 +332,7 @@ l1oip_4bit_alloc(int ulaw)
        /* alloc conversion tables */
        table_com = vmalloc(65536);
        table_dec = vmalloc(512);
-       if (!table_com | !table_dec) {
+       if (!table_com || !table_dec) {
                l1oip_4bit_free();
                return -ENOMEM;
        }