diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 10:32:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 10:32:56 +0200 |
| commit | 896395c290f902576270d84291c1f7f8bfbe339d (patch) | |
| tree | 650114bff3a5f808ee1d713ecc443b0eaab2e1c3 /drivers/isdn/hysdn/hycapi.c | |
| parent | af1cf204ba2fd8135933a2e4df523fb1112dc0e2 (diff) | |
| parent | 1b40a895df6c7d5a80e71f65674060b03d84bbef (diff) | |
Merge branch 'linus' into tmp.x86.mpparse.new
Diffstat (limited to 'drivers/isdn/hysdn/hycapi.c')
| -rw-r--r-- | drivers/isdn/hysdn/hycapi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/isdn/hysdn/hycapi.c b/drivers/isdn/hysdn/hycapi.c index d3999a8e9f8..53f6ad1235d 100644 --- a/drivers/isdn/hysdn/hycapi.c +++ b/drivers/isdn/hysdn/hycapi.c @@ -462,11 +462,11 @@ static int hycapi_read_proc(char *page, char **start, off_t off, default: s = "???"; break; } len += sprintf(page+len, "%-16s %s\n", "type", s); - if ((s = cinfo->version[VER_DRIVER]) != 0) + if ((s = cinfo->version[VER_DRIVER]) != NULL) len += sprintf(page+len, "%-16s %s\n", "ver_driver", s); - if ((s = cinfo->version[VER_CARDTYPE]) != 0) + if ((s = cinfo->version[VER_CARDTYPE]) != NULL) len += sprintf(page+len, "%-16s %s\n", "ver_cardtype", s); - if ((s = cinfo->version[VER_SERIAL]) != 0) + if ((s = cinfo->version[VER_SERIAL]) != NULL) len += sprintf(page+len, "%-16s %s\n", "ver_serial", s); len += sprintf(page+len, "%-16s %s\n", "cardname", cinfo->cardname); |