Merge branches 'pcmcia-config-loop' and 'pcmcia-printk' into pcmcia

[linux-2.6-omap-h63xx.git] / drivers / isdn / hardware / avm / t1pci.c

diff --git a/drivers/isdn/hardware/avm/t1pci.c b/drivers/isdn/hardware/avm/t1pci.c
index d1e253c94db4b751f353a58587f4378c0adc4666..e6d298d751465af4411143831b7bb4b9d2b3057a 100644 (file)
--- a/drivers/isdn/hardware/avm/t1pci.c
+++ b/drivers/isdn/hardware/avm/t1pci.c
@@ -233,9 +233,9 @@ static int __init t1pci_init(void)
        char rev[32];
        int err;
 
-       if ((p = strchr(revision, ':')) != 0 && p[1]) {
+       if ((p = strchr(revision, ':')) != NULL && p[1]) {
                strlcpy(rev, p + 2, 32);
-               if ((p = strchr(rev, '$')) != 0 && p > rev)
+               if ((p = strchr(rev, '$')) != NULL && p > rev)
                   *(p-1) = 0;
        } else
                strcpy(rev, "1.0");