diff options
Diffstat (limited to 'fs/udf/unicode.c')
-rw-r--r-- | fs/udf/unicode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/udf/unicode.c b/fs/udf/unicode.c index d03a90b6ad69..44b815e57f94 100644 --- a/fs/udf/unicode.c +++ b/fs/udf/unicode.c | |||
@@ -114,7 +114,7 @@ int udf_CS0toUTF8(struct ustr *utf_o, const struct ustr *ocu_i) | |||
114 | cmp_id = ocu_i->u_cmpID; | 114 | cmp_id = ocu_i->u_cmpID; |
115 | if (cmp_id != 8 && cmp_id != 16) { | 115 | if (cmp_id != 8 && cmp_id != 16) { |
116 | memset(utf_o, 0, sizeof(struct ustr)); | 116 | memset(utf_o, 0, sizeof(struct ustr)); |
117 | printk(KERN_ERR "udf: unknown compression code (%d) stri=%s\n", | 117 | pr_err("unknown compression code (%d) stri=%s\n", |
118 | cmp_id, ocu_i->u_name); | 118 | cmp_id, ocu_i->u_name); |
119 | return 0; | 119 | return 0; |
120 | } | 120 | } |
@@ -242,7 +242,7 @@ try_again: | |||
242 | if (utf_cnt) { | 242 | if (utf_cnt) { |
243 | error_out: | 243 | error_out: |
244 | ocu[++u_len] = '?'; | 244 | ocu[++u_len] = '?'; |
245 | printk(KERN_DEBUG "udf: bad UTF-8 character\n"); | 245 | printk(KERN_DEBUG pr_fmt("bad UTF-8 character\n")); |
246 | } | 246 | } |
247 | 247 | ||
248 | ocu[length - 1] = (uint8_t)u_len + 1; | 248 | ocu[length - 1] = (uint8_t)u_len + 1; |
@@ -267,7 +267,7 @@ static int udf_CS0toNLS(struct nls_table *nls, struct ustr *utf_o, | |||
267 | cmp_id = ocu_i->u_cmpID; | 267 | cmp_id = ocu_i->u_cmpID; |
268 | if (cmp_id != 8 && cmp_id != 16) { | 268 | if (cmp_id != 8 && cmp_id != 16) { |
269 | memset(utf_o, 0, sizeof(struct ustr)); | 269 | memset(utf_o, 0, sizeof(struct ustr)); |
270 | printk(KERN_ERR "udf: unknown compression code (%d) stri=%s\n", | 270 | pr_err("unknown compression code (%d) stri=%s\n", |
271 | cmp_id, ocu_i->u_name); | 271 | cmp_id, ocu_i->u_name); |
272 | return 0; | 272 | return 0; |
273 | } | 273 | } |