diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 09:22:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 09:22:34 -0700 |
| commit | 8d5eb435c3523b15f67c35a5d4defa8d1757f9bd (patch) | |
| tree | 9f177b1855dc32fde402022fe86b896946a78fce | |
| parent | 49b2de8e6febfea5a8791b6476195903af83a35d (diff) | |
| parent | 9bd7496f5dd488e109e91d9d5743915fb4dfbfde (diff) | |
| download | kernel_samsung_smdk4412-8d5eb435c3523b15f67c35a5d4defa8d1757f9bd.zip kernel_samsung_smdk4412-8d5eb435c3523b15f67c35a5d4defa8d1757f9bd.tar.gz kernel_samsung_smdk4412-8d5eb435c3523b15f67c35a5d4defa8d1757f9bd.tar.bz2 | |
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:
ide: Serialize CMD643 and CMD646 to fix a hardware bug with SSD
| -rw-r--r-- | drivers/ide/cmd64x.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ide/cmd64x.c b/drivers/ide/cmd64x.c index 680e597..ca0c46f 100644 --- a/drivers/ide/cmd64x.c +++ b/drivers/ide/cmd64x.c @@ -379,7 +379,8 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitdata = { .enablebits = {{0x00,0x00,0x00}, {0x51,0x08,0x08}}, .port_ops = &cmd64x_port_ops, .host_flags = IDE_HFLAG_CLEAR_SIMPLEX | - IDE_HFLAG_ABUSE_PREFETCH, + IDE_HFLAG_ABUSE_PREFETCH | + IDE_HFLAG_SERIALIZE, .pio_mask = ATA_PIO5, .mwdma_mask = ATA_MWDMA2, .udma_mask = 0x00, /* no udma */ @@ -389,7 +390,8 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitdata = { .init_chipset = init_chipset_cmd64x, .enablebits = {{0x51,0x04,0x04}, {0x51,0x08,0x08}}, .port_ops = &cmd648_port_ops, - .host_flags = IDE_HFLAG_ABUSE_PREFETCH, + .host_flags = IDE_HFLAG_ABUSE_PREFETCH | + IDE_HFLAG_SERIALIZE, .pio_mask = ATA_PIO5, .mwdma_mask = ATA_MWDMA2, .udma_mask = ATA_UDMA2, |