diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-01 19:48:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-01 19:48:21 -0800 |
| commit | 562aa1d4c6a874373f9a48ac184f662fbbb06a04 (patch) | |
| tree | ad4d9c19f7a98bb4f35b35104ffecb5723f686c8 /drivers/ata/libata-core.c | |
| parent | b4350861dd6d5668bb9fe18eec4227d30e9131b0 (diff) | |
| parent | afb2d552bc4c241c009f5947311a95de426a75d9 (diff) | |
| download | lwn-562aa1d4c6a874373f9a48ac184f662fbbb06a04.tar.gz lwn-562aa1d4c6a874373f9a48ac184f662fbbb06a04.zip | |
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:
ahci: improve spurious SDB FIS handling
ahci/pata_jmicron: match class not function number
jmicron ATA: reimplement jmicron ATA quirk
pata_jmicron: drop unnecessary device programming in [re]init
libata: blacklist FUJITSU MHT2060BH for NCQ
sata_sil24: kill unused local variable idx in sil24_fill_sg()
libata: clear drvdata in ata_host_release(), take#2
Diffstat (limited to 'drivers/ata/libata-core.c')
| -rw-r--r-- | drivers/ata/libata-core.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index c8d44a7c403f..ac3d1204ea35 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -3346,6 +3346,8 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { /* Devices where NCQ should be avoided */ /* NCQ is slow */ { "WDC WD740ADFD-00", NULL, ATA_HORKAGE_NONCQ }, + /* http://thread.gmane.org/gmane.linux.ide/14907 */ + { "FUJITSU MHT2060BH", NULL, ATA_HORKAGE_NONCQ }, /* Devices with NCQ limits */ @@ -5680,6 +5682,8 @@ static void ata_host_release(struct device *gendev, void *res) if (host->ops->host_stop) host->ops->host_stop(host); + + dev_set_drvdata(gendev, NULL); } /** @@ -5902,7 +5906,6 @@ int ata_device_add(const struct ata_probe_ent *ent) err_out: devres_release_group(dev, ata_device_add); - dev_set_drvdata(dev, NULL); VPRINTK("EXIT, returning %d\n", rc); return 0; } |