aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-19 11:06:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-19 11:06:34 -0700
commit81cef8e38babd1dd07eb53fccc956620a1b4f32e (patch)
treea012ad63404b652379b8a0bed80825266a94eaad
parent7d7dee96e1a7369eae67e5fe5c987785a1c11e40 (diff)
parentdbee032295dac88742734ee9988e08a0e4f2f732 (diff)
downloadmrst-s0i3-test-81cef8e38babd1dd07eb53fccc956620a1b4f32e.tar.gz
mrst-s0i3-test-81cef8e38babd1dd07eb53fccc956620a1b4f32e.tar.xz
mrst-s0i3-test-81cef8e38babd1dd07eb53fccc956620a1b4f32e.zip
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: Fix ordering of procfs registry.
-rw-r--r--drivers/ide/ide-probe.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 4c3d1bfec0c..068cef0a987 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1448,19 +1448,13 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,
if (hwif == NULL)
continue;
- if (hwif->present)
- hwif_register_devices(hwif);
- }
-
- ide_host_for_each_port(i, hwif, host) {
- if (hwif == NULL)
- continue;
-
ide_sysfs_register_port(hwif);
ide_proc_register_port(hwif);
- if (hwif->present)
+ if (hwif->present) {
ide_proc_port_register_devices(hwif);
+ hwif_register_devices(hwif);
+ }
}
return j ? 0 : -1;