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

Commit 4c5e354a authored by Tilman Schmidt's avatar Tilman Schmidt Committed by David S. Miller
Browse files

ser_gigaset: fix deallocation of platform device structure 



When shutting down the device, the struct ser_cardstate must not be
kfree()d immediately after the call to platform_device_unregister()
since the embedded struct platform_device is still in use.
Move the kfree() call to the release method instead.

Signed-off-by: default avatarTilman Schmidt <tilman@imap.cc>
Fixes: 2869b23e ("drivers/isdn/gigaset: new M101 driver (v2)")
Reported-by: default avatarSasha Levin <sasha.levin@oracle.com>
Signed-off-by: default avatarPaul Bolle <pebolle@tiscali.nl>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ede03d30

drivers/isdn/gigaset/ser-gigaset.c

+7 −3
Original line number Diff line number Diff line
@@ -368,19 +368,23 @@ static void gigaset_freecshw(struct cardstate *cs) 
	tasklet_kill(&cs->write_tasklet);

	if (!cs->hw.ser)

		return;

	dev_set_drvdata(&cs->hw.ser->dev.dev, NULL);

	platform_device_unregister(&cs->hw.ser->dev);

	kfree(cs->hw.ser);

	cs->hw.ser = NULL;

}



static void gigaset_device_release(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct cardstate *cs = dev_get_drvdata(dev);



	/* adapted from platform_device_release() in drivers/base/platform.c */

	kfree(dev->platform_data);

	kfree(pdev->resource);



	if (!cs)

		return;

	dev_set_drvdata(dev, NULL);

	kfree(cs->hw.ser);

	cs->hw.ser = NULL;

}



/*