aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hardware/avm/c4.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/isdn/hardware/avm/c4.c')
-rw-r--r--drivers/isdn/hardware/avm/c4.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/isdn/hardware/avm/c4.c b/drivers/isdn/hardware/avm/c4.c
index 4bbbbe688077..9df1d3f66c87 100644
--- a/drivers/isdn/hardware/avm/c4.c
+++ b/drivers/isdn/hardware/avm/c4.c
@@ -1088,11 +1088,11 @@ static int c4_read_proc(char *page, char **start, off_t off,
1088 default: s = "???"; break; 1088 default: s = "???"; break;
1089 } 1089 }
1090 len += sprintf(page+len, "%-16s %s\n", "type", s); 1090 len += sprintf(page+len, "%-16s %s\n", "type", s);
1091 if ((s = cinfo->version[VER_DRIVER]) != 0) 1091 if ((s = cinfo->version[VER_DRIVER]) != NULL)
1092 len += sprintf(page+len, "%-16s %s\n", "ver_driver", s); 1092 len += sprintf(page+len, "%-16s %s\n", "ver_driver", s);
1093 if ((s = cinfo->version[VER_CARDTYPE]) != 0) 1093 if ((s = cinfo->version[VER_CARDTYPE]) != NULL)
1094 len += sprintf(page+len, "%-16s %s\n", "ver_cardtype", s); 1094 len += sprintf(page+len, "%-16s %s\n", "ver_cardtype", s);
1095 if ((s = cinfo->version[VER_SERIAL]) != 0) 1095 if ((s = cinfo->version[VER_SERIAL]) != NULL)
1096 len += sprintf(page+len, "%-16s %s\n", "ver_serial", s); 1096 len += sprintf(page+len, "%-16s %s\n", "ver_serial", s);
1097 1097
1098 if (card->cardtype != avm_m1) { 1098 if (card->cardtype != avm_m1) {
@@ -1167,7 +1167,7 @@ static int c4_add_card(struct capicardparams *p, struct pci_dev *dev,
1167 } 1167 }
1168 1168
1169 card->mbase = ioremap(card->membase, 128); 1169 card->mbase = ioremap(card->membase, 128);
1170 if (card->mbase == 0) { 1170 if (card->mbase == NULL) {
1171 printk(KERN_NOTICE "c4: can't remap memory at 0x%lx\n", 1171 printk(KERN_NOTICE "c4: can't remap memory at 0x%lx\n",
1172 card->membase); 1172 card->membase);
1173 retval = -EIO; 1173 retval = -EIO;
@@ -1291,9 +1291,9 @@ static int __init c4_init(void)
1291 char rev[32]; 1291 char rev[32];
1292 int err; 1292 int err;
1293 1293
1294 if ((p = strchr(revision, ':')) != 0 && p[1]) { 1294 if ((p = strchr(revision, ':')) != NULL && p[1]) {
1295 strlcpy(rev, p + 2, 32); 1295 strlcpy(rev, p + 2, 32);
1296 if ((p = strchr(rev, '$')) != 0 && p > rev) 1296 if ((p = strchr(rev, '$')) != NULL && p > rev)
1297 *(p-1) = 0; 1297 *(p-1) = 0;
1298 } else 1298 } else
1299 strcpy(rev, "1.0"); 1299 strcpy(rev, "1.0");