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

Commit 909f4369 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: fix ide_unregister() usage in host drivers 



bast-ide.c/ide-cs.c/delkin_cb.c:

* Don't set 'restore' flag for ide_unregister() when initializing new
  interface.

rapide.c/ide-pnp.c/ide-cs.c/ide_platform.c/au1xxx-ide.c/delkin_cb.c/scc_pata.c:

* Don't set 'init_default' and 'restore' flags for ide_unregister() when
  removing interface.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 9e016a71

drivers/ide/arm/bast-ide.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ bastide_register(unsigned int base, unsigned int aux, int irq, 
	i = hwif->index;



	if (hwif->present)

		ide_unregister(i, 0, 1);

		ide_unregister(i, 0, 0);

	else if (!hwif->hold)

		ide_init_port_data(hwif, i);

drivers/ide/arm/rapide.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static void __devexit rapide_remove(struct expansion_card *ec) 


	ecard_set_drvdata(ec, NULL);



	ide_unregister(hwif->index, 1, 1);

	ide_unregister(hwif->index, 0, 0);



	ecard_release_resources(ec);

}

drivers/ide/ide-pnp.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static void idepnp_remove(struct pnp_dev * dev) 
	ide_hwif_t *hwif = pnp_get_drvdata(dev);



	if (hwif)

		ide_unregister(hwif->index, 1, 1);

		ide_unregister(hwif->index, 0, 0);

	else

		printk(KERN_ERR "idepnp: Unable to remove device, please report.\n");

}

drivers/ide/legacy/ide-cs.c

+2 −2
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static int idecs_register(unsigned long io, unsigned long ctl, unsigned long irq 
    i = hwif->index;



    if (hwif->present)

	ide_unregister(i, 0, 1);

	ide_unregister(i, 0, 0);

    else if (!hwif->hold)

	ide_init_port_data(hwif, i);
@@ -360,7 +360,7 @@ void ide_release(struct pcmcia_device *link) 
    if (info->ndev) {

	/* FIXME: if this fails we need to queue the cleanup somehow

	   -- need to investigate the required PCMCIA magic */

	ide_unregister(info->hd, 1, 1);

	ide_unregister(info->hd, 0, 0);

    }

    info->ndev = 0;

drivers/ide/legacy/ide_platform.c

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static int __devexit plat_ide_remove(struct platform_device *pdev) 
{

	ide_hwif_t *hwif = pdev->dev.driver_data;



	ide_unregister(hwif->index, 1, 1);

	ide_unregister(hwif->index, 0, 0);



	return 0;

}