diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2008-06-04 04:26:59 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2008-06-04 04:26:59 -0400 |
| commit | f38bb7de289f5c15e287386d35e9c325f1062c49 (patch) | |
| tree | 38e69a9ecea18243e3f66bcf51bc89cd7b8f0c94 /drivers/isdn/hysdn/hycapi.c | |
| parent | 2d4b3f37ded8998a362c8d0b4be02f583dd9a002 (diff) | |
| parent | c3b25b32e8bef526cca748e1ba023c6bdd705a99 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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, | |||
| 462 | default: s = "???"; break; | 462 | default: s = "???"; break; |
| 463 | } | 463 | } |
| 464 | len += sprintf(page+len, "%-16s %s\n", "type", s); | 464 | len += sprintf(page+len, "%-16s %s\n", "type", s); |
| 465 | if ((s = cinfo->version[VER_DRIVER]) != 0) | 465 | if ((s = cinfo->version[VER_DRIVER]) != NULL) |
| 466 | len += sprintf(page+len, "%-16s %s\n", "ver_driver", s); | 466 | len += sprintf(page+len, "%-16s %s\n", "ver_driver", s); |
| 467 | if ((s = cinfo->version[VER_CARDTYPE]) != 0) | 467 | if ((s = cinfo->version[VER_CARDTYPE]) != NULL) |
| 468 | len += sprintf(page+len, "%-16s %s\n", "ver_cardtype", s); | 468 | len += sprintf(page+len, "%-16s %s\n", "ver_cardtype", s); |
| 469 | if ((s = cinfo->version[VER_SERIAL]) != 0) | 469 | if ((s = cinfo->version[VER_SERIAL]) != NULL) |
| 470 | len += sprintf(page+len, "%-16s %s\n", "ver_serial", s); | 470 | len += sprintf(page+len, "%-16s %s\n", "ver_serial", s); |
| 471 | 471 | ||
| 472 | len += sprintf(page+len, "%-16s %s\n", "cardname", cinfo->cardname); | 472 | len += sprintf(page+len, "%-16s %s\n", "cardname", cinfo->cardname); |