aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mtd/mtdoops.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/mtd/mtdoops.c b/drivers/mtd/mtdoops.c
index f8af627f0b98..20eaf294f620 100644
--- a/drivers/mtd/mtdoops.c
+++ b/drivers/mtd/mtdoops.c
@@ -286,7 +286,6 @@ mtdoops_console_write(struct console *co, const char *s, unsigned int count)
286{ 286{
287 struct mtdoops_context *cxt = co->data; 287 struct mtdoops_context *cxt = co->data;
288 struct mtd_info *mtd = cxt->mtd; 288 struct mtd_info *mtd = cxt->mtd;
289 int i;
290 289
291 if (!oops_in_progress) { 290 if (!oops_in_progress) {
292 mtdoops_console_sync(); 291 mtdoops_console_sync();
@@ -305,10 +304,8 @@ mtdoops_console_write(struct console *co, const char *s, unsigned int count)
305 if ((count + cxt->writecount) > OOPS_PAGE_SIZE) 304 if ((count + cxt->writecount) > OOPS_PAGE_SIZE)
306 count = OOPS_PAGE_SIZE - cxt->writecount; 305 count = OOPS_PAGE_SIZE - cxt->writecount;
307 306
308 for (i = 0; i < count; i++, s++) 307 memcpy(cxt->oops_buf + cxt->writecount, s, count);
309 *((char *)(cxt->oops_buf) + cxt->writecount + i) = *s; 308 cxt->writecount += count;
310
311 cxt->writecount = cxt->writecount + count;
312} 309}
313 310
314static int __init mtdoops_console_setup(struct console *co, char *options) 311static int __init mtdoops_console_setup(struct console *co, char *options)