Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbee0322 authored by Wolfram Sang's avatar Wolfram Sang Committed by David S. Miller
Browse files

ide: Fix ordering of procfs registry. 



We must ensure that ide_proc_port_register_devices() occurs on an
interface before ide_proc_register_driver() executes for that
interfaces drives.

Therefore defer the registry of the driver device objects backed by
ide_bus_type until after ide_proc_port_register_devices() has run
and thus all of the drive->proc procfs directory pointers have been
setup.

Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cd078af6

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;