diff options
Diffstat (limited to 'drivers/isdn/capi/capifs.c')
-rw-r--r-- | drivers/isdn/capi/capifs.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/isdn/capi/capifs.c b/drivers/isdn/capi/capifs.c index 6d7c47ec0367..550e80f390a6 100644 --- a/drivers/isdn/capi/capifs.c +++ b/drivers/isdn/capi/capifs.c | |||
@@ -69,6 +69,7 @@ static int capifs_remount(struct super_block *s, int *flags, char *data) | |||
69 | } else if (sscanf(this_char, "mode=%o%c", &n, &dummy) == 1) | 69 | } else if (sscanf(this_char, "mode=%o%c", &n, &dummy) == 1) |
70 | mode = n & ~S_IFMT; | 70 | mode = n & ~S_IFMT; |
71 | else { | 71 | else { |
72 | kfree(new_opt); | ||
72 | printk("capifs: called with bogus options\n"); | 73 | printk("capifs: called with bogus options\n"); |
73 | return -EINVAL; | 74 | return -EINVAL; |
74 | } | 75 | } |
@@ -189,9 +190,9 @@ static int __init capifs_init(void) | |||
189 | char *p; | 190 | char *p; |
190 | int err; | 191 | int err; |
191 | 192 | ||
192 | if ((p = strchr(revision, ':')) != 0 && p[1]) { | 193 | if ((p = strchr(revision, ':')) != NULL && p[1]) { |
193 | strlcpy(rev, p + 2, sizeof(rev)); | 194 | strlcpy(rev, p + 2, sizeof(rev)); |
194 | if ((p = strchr(rev, '$')) != 0 && p > rev) | 195 | if ((p = strchr(rev, '$')) != NULL && p > rev) |
195 | *(p-1) = 0; | 196 | *(p-1) = 0; |
196 | } else | 197 | } else |
197 | strcpy(rev, "1.0"); | 198 | strcpy(rev, "1.0"); |