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

Commit 9a100f4b authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: fix ide_register_port() failure handling 



* Factor out port freeing from ide_host_free() to ide_free_port().

* Add ide_disable_port() and use it on ide_register_port() failure.

Cc: Ian Campbell <Ian.Campbell@citrix.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent e5461f38

drivers/ide/ide-probe.c

+32 −8
Original line number Diff line number Diff line
@@ -1467,6 +1467,30 @@ struct ide_host *ide_host_alloc(const struct ide_port_info *d, hw_regs_t **hws) 
}

EXPORT_SYMBOL_GPL(ide_host_alloc);



static void ide_port_free(ide_hwif_t *hwif)

{

	ide_port_free_devices(hwif);

	ide_free_port_slot(hwif->index);

	kfree(hwif);

}



static void ide_disable_port(ide_hwif_t *hwif)

{

	struct ide_host *host = hwif->host;

	int i;



	printk(KERN_INFO "%s: disabling port\n", hwif->name);



	for (i = 0; i < MAX_HOST_PORTS; i++) {

		if (host->ports[i] == hwif) {

			host->ports[i] = NULL;

			host->n_ports--;

		}

	}



	ide_port_free(hwif);

}



int ide_host_register(struct ide_host *host, const struct ide_port_info *d,

		      hw_regs_t **hws)

{
@@ -1507,8 +1531,12 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d, 
			hwif->present = 1;



		if (hwif->chipset != ide_4drives || !hwif->mate ||

		    !hwif->mate->present)

			ide_register_port(hwif);

		    !hwif->mate->present) {

			if (ide_register_port(hwif)) {

				ide_disable_port(hwif);

				continue;

			}

		}



		if (hwif->present)

			ide_port_tune_devices(hwif);
@@ -1660,12 +1688,8 @@ void ide_host_free(struct ide_host *host) 
	int i;



	ide_host_for_each_port(i, hwif, host) {

		if (hwif == NULL)

			continue;



		ide_port_free_devices(hwif);

		ide_free_port_slot(hwif->index);

		kfree(hwif);

		if (hwif)

			ide_port_free(hwif);

	}



	kfree(host);