From 376df3766f183142b7a0691fa00239df8310aafd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5vard=20Skinnemoen?= Date: Fri, 15 Sep 2006 17:19:31 +0200 Subject: [PATCH] --- yaml --- r: 34001 b: refs/heads/master c: de591dacf3034977b3fb94b61d08240c8b35c39d h: refs/heads/master i: 33999: fe8cd6c0e15a3f9cbbaf70d64dbe06fe6ab9f6d8 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/chips/cfi_cmdset_0002.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index acbb3b964aed..28ff9a564a08 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d882687c51b52424a56992578ce7636b3f3c8d41 +refs/heads/master: de591dacf3034977b3fb94b61d08240c8b35c39d diff --git a/trunk/drivers/mtd/chips/cfi_cmdset_0002.c b/trunk/drivers/mtd/chips/cfi_cmdset_0002.c index ddc5bd783354..a482e8922de1 100644 --- a/trunk/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/trunk/drivers/mtd/chips/cfi_cmdset_0002.c @@ -175,7 +175,7 @@ static void fixup_convert_atmel_pri(struct mtd_info *mtd, void *param) struct cfi_pri_atmel atmel_pri; memcpy(&atmel_pri, extp, sizeof(atmel_pri)); - memset(extp + 5, 0, sizeof(*extp) - 5); + memset((char *)extp + 5, 0, sizeof(*extp) - 5); if (atmel_pri.Features & 0x02) extp->EraseSuspend = 2;