forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6: Revert "Revert "ide: try to use PIO Mode 0 during probe if possible"" sis5513: fix PIO setup for ATAPI devices
- Loading branch information
Showing
2 changed files
with
15 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
* Copyright (C) 1999-2000 Andre Hedrick <[email protected]> | ||
* Copyright (C) 2002 Lionel Bouton <[email protected]>, Maintainer | ||
* Copyright (C) 2003 Vojtech Pavlik <[email protected]> | ||
* Copyright (C) 2007 Bartlomiej Zolnierkiewicz | ||
* Copyright (C) 2007-2009 Bartlomiej Zolnierkiewicz | ||
* | ||
* May be copied or modified under the terms of the GNU General Public License | ||
* | ||
|
@@ -281,11 +281,13 @@ static void config_drive_art_rwp(ide_drive_t *drive) | |
|
||
pci_read_config_byte(dev, 0x4b, ®4bh); | ||
|
||
rw_prefetch = reg4bh & ~(0x11 << drive->dn); | ||
|
||
if (drive->media == ide_disk) | ||
rw_prefetch = 0x11 << drive->dn; | ||
rw_prefetch |= 0x11 << drive->dn; | ||
|
||
if ((reg4bh & (0x11 << drive->dn)) != rw_prefetch) | ||
pci_write_config_byte(dev, 0x4b, reg4bh|rw_prefetch); | ||
if (reg4bh != rw_prefetch) | ||
pci_write_config_byte(dev, 0x4b, rw_prefetch); | ||
} | ||
|
||
static void sis_set_pio_mode(ide_drive_t *drive, const u8 pio) | ||
|