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

Commit a7d6fdf9 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'pxa-for-5.2' of https://github.com/rjarzmik/linux into arm/soc 

This is the pxa changes for 5.2 cycle :
 - only a little fix the PXA SSP removal path

* tag 'pxa-for-5.2' of https://github.com/rjarzmik/linux

:
  ARM: pxa: ssp: Fix "WARNING: invalid free of devm_ allocated data"

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e5a0be94 9ee8578d

arch/arm/plat-pxa/ssp.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -183,18 +183,12 @@ static int pxa_ssp_probe(struct platform_device *pdev) 




static int pxa_ssp_remove(struct platform_device *pdev)

static int pxa_ssp_remove(struct platform_device *pdev)

{

{

	struct resource *res;

	struct ssp_device *ssp;

	struct ssp_device *ssp;





	ssp = platform_get_drvdata(pdev);

	ssp = platform_get_drvdata(pdev);

	if (ssp == NULL)

	if (ssp == NULL)

		return -ENODEV;

		return -ENODEV;





	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	release_mem_region(res->start, resource_size(res));



	clk_put(ssp->clk);



	mutex_lock(&ssp_lock);

	mutex_lock(&ssp_lock);

	list_del(&ssp->node);

	list_del(&ssp->node);

	mutex_unlock(&ssp_lock);

	mutex_unlock(&ssp_lock);