aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-probe.c
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@datenfreihafen.org>2017-10-18 17:40:18 +0200
committerStefan Schmidt <stefan@datenfreihafen.org>2017-10-18 17:40:18 +0200
commit396665e8320987ff43b20a62a6a1cdae57aa1cc1 (patch)
treebf778eab1ef1c9ff102bb235d9bca1a42bec7d0a /drivers/ide/ide-probe.c
parentd01174fcd2c1ffefdd0554f847c4045a5c731591 (diff)
parentb9f1f1ce866c28e3d9b86202441b220244754a69 (diff)
downloadlinux-396665e8320987ff43b20a62a6a1cdae57aa1cc1.tar.gz
Merge remote-tracking branch 'net-next/master'
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r--drivers/ide/ide-probe.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 01b2adfd8226..eaf39e5db08b 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1451,6 +1451,7 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,
if (hwif_init(hwif) == 0) {
printk(KERN_INFO "%s: failed to initialize IDE "
"interface\n", hwif->name);
+ device_unregister(hwif->portdev);
device_unregister(&hwif->gendev);
ide_disable_port(hwif);
continue;