From 03179e44d1f369a8081353e234fea58e682d2a39 Mon Sep 17 00:00:00 2001 From: Peter Huewe Date: Thu, 7 Feb 2013 23:57:07 +0100 Subject: [PATCH] --- yaml --- r: 354463 b: refs/heads/master c: b4fcf48a740fde8e5acb8e64ad0845fb2500dde4 h: refs/heads/master i: 354461: 122a99f9fa854e6b59081da817069470b4a8aca7 354459: ff62d1026cc7991ce0074cceb62035b69169a2ad 354455: ecbc294240ef00f944cc4253ad061cc333a46183 354447: 370995583e97ba56d91b73d6ec149e2463cb3ee7 354431: ff25604957831662f29fe3b3dfcbd36573a751df v: v3 --- [refs] | 2 +- trunk/drivers/staging/goldfish/goldfish_nand.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3ad291621ec5..56ec7cd46b3f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37fa328f066dc38bf58337b6488232c8cefe37f3 +refs/heads/master: b4fcf48a740fde8e5acb8e64ad0845fb2500dde4 diff --git a/trunk/drivers/staging/goldfish/goldfish_nand.c b/trunk/drivers/staging/goldfish/goldfish_nand.c index 1891d89630dc..ab1f01952b48 100644 --- a/trunk/drivers/staging/goldfish/goldfish_nand.c +++ b/trunk/drivers/staging/goldfish/goldfish_nand.c @@ -156,7 +156,7 @@ static int goldfish_nand_read_oob(struct mtd_info *mtd, loff_t ofs, return 0; invalid_arg: - pr_err("goldfish_nand_read_oob: invalid read, start %llx, len %x, ooblen %x, dev_size %llx, write_size %x\n", + pr_err("goldfish_nand_read_oob: invalid read, start %llx, len %zx, ooblen %zx, dev_size %llx, write_size %x\n", ofs, ops->len, ops->ooblen, mtd->size, mtd->writesize); return -EINVAL; } @@ -188,7 +188,7 @@ static int goldfish_nand_write_oob(struct mtd_info *mtd, loff_t ofs, return 0; invalid_arg: - pr_err("goldfish_nand_write_oob: invalid write, start %llx, len %x, ooblen %x, dev_size %llx, write_size %x\n", + pr_err("goldfish_nand_write_oob: invalid write, start %llx, len %zx, ooblen %zx, dev_size %llx, write_size %x\n", ofs, ops->len, ops->ooblen, mtd->size, mtd->writesize); return -EINVAL; } @@ -212,7 +212,7 @@ static int goldfish_nand_read(struct mtd_info *mtd, loff_t from, size_t len, return 0; invalid_arg: - pr_err("goldfish_nand_read: invalid read, start %llx, len %x, dev_size %llx, write_size %x\n", + pr_err("goldfish_nand_read: invalid read, start %llx, len %zx, dev_size %llx, write_size %x\n", from, len, mtd->size, mtd->writesize); return -EINVAL; } @@ -236,7 +236,7 @@ static int goldfish_nand_write(struct mtd_info *mtd, loff_t to, size_t len, return 0; invalid_arg: - pr_err("goldfish_nand_write: invalid write, start %llx, len %x, dev_size %llx, write_size %x\n", + pr_err("goldfish_nand_write: invalid write, start %llx, len %zx, dev_size %llx, write_size %x\n", to, len, mtd->size, mtd->writesize); return -EINVAL; }