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

Commit 7cd95f56 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: fix hwif->gendev refcounting 



class->dev_release is called by device_release() iff dev->release
is not present so ide_port_class_release() is never called and the
last hwif->gendev reference is not dropped.

Fix it by removing ide_port_class_release() and get_device() call
from ide_register_port() (device_create_drvdata() takes a hwif->gendev
reference anyway).

This patch fixes hang on wait_for_completion(&hwif->gendev_rel_comp)
in ide_unregister() reported by Pavel Machek.

Cc: Pavel Machek <pavel@suse.cz>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent b8a0b6cc

drivers/ide/ide-probe.c

+0 −2
Original line number Diff line number Diff line
@@ -646,8 +646,6 @@ static int ide_register_port(ide_hwif_t *hwif) 
		goto out;

	}



	get_device(&hwif->gendev);



	hwif->portdev = device_create_drvdata(ide_port_class, &hwif->gendev,

					      MKDEV(0, 0), hwif, hwif->name);

	if (IS_ERR(hwif->portdev)) {

drivers/ide/ide.c

+0 −8
Original line number Diff line number Diff line
@@ -1094,13 +1094,6 @@ struct bus_type ide_bus_type = { 


EXPORT_SYMBOL_GPL(ide_bus_type);



static void ide_port_class_release(struct device *portdev)

{

	ide_hwif_t *hwif = dev_get_drvdata(portdev);



	put_device(&hwif->gendev);

}



int ide_vlb_clk;

EXPORT_SYMBOL_GPL(ide_vlb_clk);
@@ -1305,7 +1298,6 @@ static int __init ide_init(void) 
		ret = PTR_ERR(ide_port_class);

		goto out_port_class;

	}

	ide_port_class->dev_release = ide_port_class_release;



	init_ide_data();