diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 22:23:18 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 22:23:18 -0300 |
commit | c2f90e9536887fb76fb6a2aa239a70fc49beda10 (patch) | |
tree | f87e6b29248c45a92ec6b4b8ffe675bb52e6104b /drivers/char | |
parent | f3409f71a76838b1bc985f753eed787a3f17bc2c (diff) | |
parent | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff) |
Merge ../linux-2.6
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/nwflash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/nwflash.c b/drivers/char/nwflash.c index f9f72a21129..006be92ee3f 100644 --- a/drivers/char/nwflash.c +++ b/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; |