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

Commit ee395008 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

rfkill: gpio: fix memory leak in probe error path 



commit 4bf01ca21e2e0e4561d1a03c48c3d740418702db upstream.

Make sure to free the rfkill device in case registration fails during
probe.

Fixes: 5e7ca393 ("net: rfkill: gpio: convert to resource managed allocation")
Cc: stable <stable@vger.kernel.org>	# 3.13
Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a24bce47

net/rfkill/rfkill-gpio.c

+6 −1
Original line number Diff line number Diff line
@@ -134,13 +134,18 @@ static int rfkill_gpio_probe(struct platform_device *pdev) 


	ret = rfkill_register(rfkill->rfkill_dev);

	if (ret < 0)

		return ret;

		goto err_destroy;



	platform_set_drvdata(pdev, rfkill);



	dev_info(&pdev->dev, "%s device registered.\n", rfkill->name);



	return 0;



err_destroy:

	rfkill_destroy(rfkill->rfkill_dev);



	return ret;

}



static int rfkill_gpio_remove(struct platform_device *pdev)