From a9b3de6eb9d5f37259e49103bd4e63caef7065d9 Mon Sep 17 00:00:00 2001 From: Maxim Shchetynin Date: Wed, 16 Jul 2008 05:51:42 +1000 Subject: [PATCH] --- yaml --- r: 104819 b: refs/heads/master c: 8204cba7fa0ca0752fdaec021dae2634788178aa h: refs/heads/master i: 104817: 55c036080a554b6554687b730c46440926cee3cb 104815: 92552895966fcf571e499f6f474bdbb3ee0b043e v: v3 --- [refs] | 2 +- trunk/arch/powerpc/sysdev/axonram.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2994aac4f44b..df6d461e611c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a23409b69440e76d34dc23846cae44f46f60d98 +refs/heads/master: 8204cba7fa0ca0752fdaec021dae2634788178aa diff --git a/trunk/arch/powerpc/sysdev/axonram.c b/trunk/arch/powerpc/sysdev/axonram.c index 9b639ede06da..9e105cbc5e5f 100644 --- a/trunk/arch/powerpc/sysdev/axonram.c +++ b/trunk/arch/powerpc/sysdev/axonram.c @@ -150,7 +150,10 @@ axon_ram_direct_access(struct block_device *device, sector_t sector, struct axon_ram_bank *bank = device->bd_disk->private_data; loff_t offset; - offset = sector << AXON_RAM_SECTOR_SHIFT; + offset = sector; + if (device->bd_part != NULL) + offset += device->bd_part->start_sect; + offset <<= AXON_RAM_SECTOR_SHIFT; if (offset >= bank->size) { dev_err(&bank->device->dev, "Access outside of address space\n"); return -ERANGE;