Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 (81cef8e3) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/ide/ide-probe.c

+3 −9

Original line number	Diff line number	Diff line
		@@ -1444,14 +1444,6 @@ int ide_host_register(struct ide_host host, const struct ide_port_info d,
		ide_acpi_port_init_devices(hwif);
		}

		ide_host_for_each_port(i, hwif, host) {
		if (hwif == NULL)
		continue;

		if (hwif->present)
		hwif_register_devices(hwif);
		}

		ide_host_for_each_port(i, hwif, host) {
		if (hwif == NULL)
		continue;
		@@ -1459,8 +1451,10 @@ int ide_host_register(struct ide_host host, const struct ide_port_info d,
		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;