diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-10 22:22:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-10 22:22:59 -0400 |
| commit | 0eb096933a02226dd0b6a2199453fcf0936bf7e4 (patch) | |
| tree | 5b2959425b8266db2a950f8d83fac13dda4e25f8 /drivers/ata/libata-core.c | |
| parent | 980abe215b861891c39aba0936817c46f372143b (diff) | |
| parent | 3dcc323fe8d7158bd662c04d41ba8b25fa3ce27b (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata clear horkage on ata_dev_init()
[libata, IDE] add new VIA bridge to VIA PATA drivers
pata_it821x: fix lost interrupt with atapi devices
Fix broken pata_via cable detection
Diffstat (limited to 'drivers/ata/libata-core.c')
| -rw-r--r-- | drivers/ata/libata-core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index a3ee087223de..c43de9a710db 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
| @@ -6035,6 +6035,7 @@ void ata_dev_init(struct ata_device *dev) | |||
| 6035 | */ | 6035 | */ |
| 6036 | spin_lock_irqsave(ap->lock, flags); | 6036 | spin_lock_irqsave(ap->lock, flags); |
| 6037 | dev->flags &= ~ATA_DFLAG_INIT_MASK; | 6037 | dev->flags &= ~ATA_DFLAG_INIT_MASK; |
| 6038 | dev->horkage = 0; | ||
| 6038 | spin_unlock_irqrestore(ap->lock, flags); | 6039 | spin_unlock_irqrestore(ap->lock, flags); |
| 6039 | 6040 | ||
| 6040 | memset((void *)dev + ATA_DEVICE_CLEAR_OFFSET, 0, | 6041 | memset((void *)dev + ATA_DEVICE_CLEAR_OFFSET, 0, |