git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0-rc4
[linux-2.6.git]
/
drivers
/
ide
/
ide-disk.c
diff --git
a/drivers/ide/ide-disk.c
b/drivers/ide/ide-disk.c
index
db55f24
..
e41f7c3
100644
(file)
--- a/
drivers/ide/ide-disk.c
+++ b/
drivers/ide/ide-disk.c
@@
-133,6
+133,8
@@
static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq,
if (hwif->no_lba48_dma && lba48 && dma) {
if (block + rq->nr_sectors > 1ULL << 28)
dma = 0;
if (hwif->no_lba48_dma && lba48 && dma) {
if (block + rq->nr_sectors > 1ULL << 28)
dma = 0;
+ else
+ lba48 = 0;
}
if (!dma) {
}
if (!dma) {
@@
-146,7
+148,7
@@
static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq,
/* FIXME: SELECT_MASK(drive, 0) ? */
if (drive->select.b.lba) {
/* FIXME: SELECT_MASK(drive, 0) ? */
if (drive->select.b.lba) {
- if (
drive->addressing == 1
) {
+ if (
lba48
) {
task_ioreg_t tasklets[10];
pr_debug("%s: LBA=0x%012llx\n", drive->name, block);
task_ioreg_t tasklets[10];
pr_debug("%s: LBA=0x%012llx\n", drive->name, block);