summaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorSteven J. Hill <sjhill@mips.com>2013-06-20 10:30:37 -0500
committerDavid S. Miller <davem@davemloft.net>2013-07-10 12:09:10 -0700
commit1581208b2f0643eebfa7a3fbe5bad831c0bb7f0e (patch)
treea8c4e201e65c58587fca8776c5c0258edae08215 /drivers/ide
parent99bfdd878693f440e723a7b33ccedd0b9dc1ca16 (diff)
downloadlinux-stable-1581208b2f0643eebfa7a3fbe5bad831c0bb7f0e.tar.gz
linux-stable-1581208b2f0643eebfa7a3fbe5bad831c0bb7f0e.tar.bz2
linux-stable-1581208b2f0643eebfa7a3fbe5bad831c0bb7f0e.zip
ide: Fix IDE PIO size calculation
IDE PIO calculates the size wrong when passing the parameter "ide-core.nodma=0.0" to the kernel. Signed-off-by: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com> Acked-by: Steven J. Hill <Steven.Hill@imgtec.com> Signed-off-by: Steven J. Hill <sjhill@mips.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide-taskfile.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 729428edeba2..dabb88b1cbec 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -239,9 +239,6 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,
unsigned nr_bytes = min(len, cursg->length - cmd->cursg_ofs);
int page_is_high;
- if (nr_bytes > PAGE_SIZE)
- nr_bytes = PAGE_SIZE;
-
page = sg_page(cursg);
offset = cursg->offset + cmd->cursg_ofs;
@@ -249,6 +246,8 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,
page = nth_page(page, (offset >> PAGE_SHIFT));
offset %= PAGE_SIZE;
+ nr_bytes = min_t(unsigned, nr_bytes, (PAGE_SIZE - offset));
+
page_is_high = PageHighMem(page);
if (page_is_high)
local_irq_save(flags);