From 02a597216b0a2343da33cdb7acb62592326b2d80 Mon Sep 17 00:00:00 2001 From: Sergei Shtylyov Date: Tue, 31 Mar 2009 20:15:29 +0200 Subject: [PATCH] --- yaml --- r: 139443 b: refs/heads/master c: 47ab834854d4639fedf2ed2f21b41297f2abe1a7 h: refs/heads/master i: 139441: 23ebd1bd2faf48d31236654e60628652a93d33e7 139439: 8a90afcd53ed047ce6f5b856c595b96df3886493 v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-disk.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 009608936f2b..cfe616d299dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74638c84821c066d02c158bc843c84499ddc9764 +refs/heads/master: 47ab834854d4639fedf2ed2f21b41297f2abe1a7 diff --git a/trunk/drivers/ide/ide-disk.c b/trunk/drivers/ide/ide-disk.c index ca934c8a1289..c998cf8e971a 100644 --- a/trunk/drivers/ide/ide-disk.c +++ b/trunk/drivers/ide/ide-disk.c @@ -227,7 +227,7 @@ static u64 idedisk_read_native_max_address(ide_drive_t *drive, int lba48) ide_no_data_taskfile(drive, &cmd); /* if OK, compute maximum address value */ - if ((tf->status & 0x01) == 0) + if (!(tf->status & ATA_ERR)) addr = ide_get_lba_addr(tf, lba48) + 1; return addr; @@ -267,7 +267,7 @@ static u64 idedisk_set_max_address(ide_drive_t *drive, u64 addr_req, int lba48) ide_no_data_taskfile(drive, &cmd); /* if OK, compute maximum address value */ - if ((tf->status & 0x01) == 0) + if (!(tf->status & ATA_ERR)) addr_set = ide_get_lba_addr(tf, lba48) + 1; return addr_set;