---

yaml --- r: 104819 b: refs/heads/master c: 8204cba h: refs/heads/master i: 104817: 55c0360 104815: 9255289 v: v3
git-mirror · Jul 22, 2008 · a9b3de6 · a9b3de6
1 parent 9a0a42c
commit a9b3de6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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;