summaryrefslogtreecommitdiffstats
path: root/fs/udf/unicode.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/udf/unicode.c')
-rw-r--r--fs/udf/unicode.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/udf/unicode.c b/fs/udf/unicode.c
index 41c3bef1d226..35cc9477b066 100644
--- a/fs/udf/unicode.c
+++ b/fs/udf/unicode.c
@@ -89,7 +89,7 @@ static void udf_build_ustr_exact(struct ustr *dest, dstring *ptr, int exactsize)
89 * both of type "struct ustr *" 89 * both of type "struct ustr *"
90 * 90 *
91 * POST-CONDITIONS 91 * POST-CONDITIONS
92 * <return> Zero on success. 92 * <return> >= 0 on success.
93 * 93 *
94 * HISTORY 94 * HISTORY
95 * November 12, 1997 - Andrew E. Mileski 95 * November 12, 1997 - Andrew E. Mileski
@@ -112,7 +112,7 @@ int udf_CS0toUTF8(struct ustr *utf_o, const struct ustr *ocu_i)
112 memset(utf_o, 0, sizeof(struct ustr)); 112 memset(utf_o, 0, sizeof(struct ustr));
113 pr_err("unknown compression code (%d) stri=%s\n", 113 pr_err("unknown compression code (%d) stri=%s\n",
114 cmp_id, ocu_i->u_name); 114 cmp_id, ocu_i->u_name);
115 return 0; 115 return -EINVAL;
116 } 116 }
117 117
118 ocu = ocu_i->u_name; 118 ocu = ocu_i->u_name;
@@ -350,7 +350,8 @@ int udf_get_filename(struct super_block *sb, uint8_t *sname, int slen,
350 350
351 udf_build_ustr_exact(unifilename, sname, slen); 351 udf_build_ustr_exact(unifilename, sname, slen);
352 if (UDF_QUERY_FLAG(sb, UDF_FLAG_UTF8)) { 352 if (UDF_QUERY_FLAG(sb, UDF_FLAG_UTF8)) {
353 if (!udf_CS0toUTF8(filename, unifilename)) { 353 ret = udf_CS0toUTF8(filename, unifilename);
354 if (ret < 0) {
354 udf_debug("Failed in udf_get_filename: sname = %s\n", 355 udf_debug("Failed in udf_get_filename: sname = %s\n",
355 sname); 356 sname);
356 goto out2; 357 goto out2;