Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 84213
b: refs/heads/master
c: 235d620
h: refs/heads/master
i:
  84211: 30568e9
v: v3
  • Loading branch information
Peter Korsgaard authored and David Woodhouse committed Dec 3, 2007
1 parent 27f270f commit 66cadf2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 256331d53a40f436cd0b16166621d819923145c8
refs/heads/master: 235d6200ea63372935e097cb82e6a8c133d51cad
7 changes: 2 additions & 5 deletions trunk/drivers/mtd/mtdoops.c
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,6 @@ mtdoops_console_write(struct console *co, const char *s, unsigned int count)
{
struct mtdoops_context *cxt = co->data;
struct mtd_info *mtd = cxt->mtd;
int i;

if (!oops_in_progress) {
mtdoops_console_sync();
Expand All @@ -305,10 +304,8 @@ mtdoops_console_write(struct console *co, const char *s, unsigned int count)
if ((count + cxt->writecount) > OOPS_PAGE_SIZE)
count = OOPS_PAGE_SIZE - cxt->writecount;

for (i = 0; i < count; i++, s++)
*((char *)(cxt->oops_buf) + cxt->writecount + i) = *s;

cxt->writecount = cxt->writecount + count;
memcpy(cxt->oops_buf + cxt->writecount, s, count);
cxt->writecount += count;
}

static int __init mtdoops_console_setup(struct console *co, char *options)
Expand Down

0 comments on commit 66cadf2

Please sign in to comment.