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

Commit 6812311c authored by Ben Hutchings's avatar Ben Hutchings Committed by Greg Kroah-Hartman
Browse files

iio: iio-trig-periodic-rtc: Free trigger resource correctly 



This is based on upstream commit 10e840dfb0b7, which did not touch the
iio-trig-periodic-rtc driver because it has been removed upstream.

The following explanation comes from that commit:

    These stand-alone trigger drivers were using iio_trigger_put()
    where they should have been using iio_trigger_free().  The
    iio_trigger_put() adds a module_put which is bad since they
    never did a module_get.

    In the sysfs driver, module_get/put's are used as triggers are
    added & removed. This extra module_put() occurs on an error path
    in the probe routine (probably rare).

    In the bfin-timer & interrupt trigger drivers, the module resources
    are not explicitly managed, so it's doing a put on something that
    was never get'd.  It occurs on the probe error path and on the
    remove path (not so rare).

    Tested with the sysfs trigger driver.
    The bfin & interrupt drivers were build tested & inspected only.

This was build tested only.

Cc: Alison Schofield <amsfield22@gmail.com>
Cc: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: default avatarBen Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 88c17527

drivers/staging/iio/trigger/iio-trig-periodic-rtc.c

+3 −3
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static int iio_trig_periodic_rtc_probe(struct platform_device *dev) 
		trig_info = kzalloc(sizeof(*trig_info), GFP_KERNEL);

		if (!trig_info) {

			ret = -ENOMEM;

			goto error_put_trigger_and_remove_from_list;

			goto error_free_trigger_and_remove_from_list;

		}

		iio_trigger_set_drvdata(trig, trig_info);

		trig->ops = &iio_prtc_trigger_ops;
@@ -164,9 +164,9 @@ error_close_rtc: 
	rtc_class_close(trig_info->rtc);

error_free_trig_info:

	kfree(trig_info);

error_put_trigger_and_remove_from_list:

error_free_trigger_and_remove_from_list:

	list_del(&trig->alloc_list);

	iio_trigger_put(trig);

	iio_trigger_free(trig);

error_free_completed_registrations:

	list_for_each_entry_safe(trig,

				 trig2,