diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-15 15:29:23 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-15 15:29:23 -0800 |
commit | 1309d4e68497184d2fd87e892ddf14076c2bda98 (patch) | |
tree | 5cbd4ee54ccbeb8834d600700a48d4acaa559923 /drivers/ata/pata_legacy.c | |
parent | 101142c37be8e5af9b847860219217e6b958c739 (diff) | |
parent | 5410f729e331bd607d99057ece59f6d7866cd3dc (diff) |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
ata: fix sparse warning in pata_acpi.c
ata: fix sparse warning in pata_marvell.c
ata: fix sparse warning in pata_jmicron.c
ata: fix sparse warning in pata_cs5536.c
ata: sparse fixes for pata_amd.c
pata_scc.c: add thaw ops
pata_cs5536.c bugfix
pata_legacy: don't call ata_host_detach() after initialization failure
ata: fix sparse warnings in sata_mv.c
ata: fix sparse warning in sata_via.c
ata: fix sparse warning in sata_promise.c
ata: fix sparse warning in ata_piix.c
ata: fix sparse warning in libata-core.c
ata: make ata_scsiop_inq_89 static in libata-scsi.c
Diffstat (limited to 'drivers/ata/pata_legacy.c')
-rw-r--r-- | drivers/ata/pata_legacy.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c index 6c59969fd50..d2177f75078 100644 --- a/drivers/ata/pata_legacy.c +++ b/drivers/ata/pata_legacy.c @@ -1278,8 +1278,6 @@ static __init int legacy_init_one(struct legacy_probe *probe) } } fail: - if (host) - ata_host_detach(host); platform_device_unregister(pdev); return ret; } |