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

Commit 435c47e2 authored by Henrique de Moraes Holschuh's avatar Henrique de Moraes Holschuh Committed by Len Brown
Browse files

thinkpad-acpi: don't leave ERR_PTR() pointers around 



backlight_device_register returns ERR_PTR() in case of problems, and
the current code would leave that ERR_PTR in ibm_backlight_device.

The current code paths won't touch it in that situation, but that could
change.  Make sure to set ibm_backlight_device to NULL in the error
path.

Signed-off-by: default avatarHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 5f0dadb4

drivers/platform/x86/thinkpad_acpi.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -6010,8 +6010,10 @@ static int __init brightness_init(struct ibm_init_struct *iibm) 
					TPACPI_BACKLIGHT_DEV_NAME, NULL, NULL,

					TPACPI_BACKLIGHT_DEV_NAME, NULL, NULL,

					&ibm_backlight_data);

					&ibm_backlight_data);

	if (IS_ERR(ibm_backlight_device)) {

	if (IS_ERR(ibm_backlight_device)) {

		int rc = PTR_ERR(ibm_backlight_device);

		ibm_backlight_device = NULL;

		printk(TPACPI_ERR "Could not register backlight device\n");

		printk(TPACPI_ERR "Could not register backlight device\n");

		return PTR_ERR(ibm_backlight_device);

		return rc;

	}

	}

	vdbg_printk(TPACPI_DBG_INIT | TPACPI_DBG_BRGHT,

	vdbg_printk(TPACPI_DBG_INIT | TPACPI_DBG_BRGHT,

			"brightness is supported\n");

			"brightness is supported\n");