From b98bc2284676656a4bc1909d6edb947221327ac2 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sat, 26 Jul 2008 15:46:39 +0100 Subject: [PATCH] --- yaml --- r: 106626 b: refs/heads/master c: 4ef584ba84125b67c17b5aded38e7783cd8cdef0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/nwflash.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 22698323211e..98b0f5e823a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb2b180ca0469a51256d5ad62008b495345ad61f +refs/heads/master: 4ef584ba84125b67c17b5aded38e7783cd8cdef0 diff --git a/trunk/drivers/char/nwflash.c b/trunk/drivers/char/nwflash.c index f9f72a211292..006be92ee3f3 100644 --- a/trunk/drivers/char/nwflash.c +++ b/trunk/drivers/char/nwflash.c @@ -125,15 +125,15 @@ static ssize_t flash_read(struct file *file, char __user *buf, size_t size, ssize_t ret; if (flashdebug) - printk(KERN_DEBUG "flash_read: flash_read: offset=0x%lX, " - "buffer=%p, count=0x%X.\n", p, buf, count); + printk(KERN_DEBUG "flash_read: flash_read: offset=0x%llx, " + "buffer=%p, count=0x%zx.\n", *ppos, buf, size); /* * We now lock against reads and writes. --rmk */ if (mutex_lock_interruptible(&nwflash_mutex)) return -ERESTARTSYS; - ret = simple_read_from_buffer(buf, size, ppos, FLASH_BASE, gbFlashSize); + ret = simple_read_from_buffer(buf, size, ppos, (void *)FLASH_BASE, gbFlashSize); mutex_unlock(&nwflash_mutex); return ret;