diff options
| author | Lan Tianyu <tianyu.lan@intel.com> | 2012-07-20 13:29:16 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-09 08:31:37 -0700 |
| commit | c1542109ac67110d3072fabb23e4604be0ff7554 (patch) | |
| tree | 6be846158ca9621deb86bc5e8a54cc6a991ea5fc | |
| parent | 8ebdf76ba264031c60e8dc720775833e0ab6512d (diff) | |
| download | linux-3.10-c1542109ac67110d3072fabb23e4604be0ff7554.tar.gz linux-3.10-c1542109ac67110d3072fabb23e4604be0ff7554.tar.bz2 linux-3.10-c1542109ac67110d3072fabb23e4604be0ff7554.zip | |
ACPI/AC: prevent OOPS on some boxes due to missing check power_supply_register() return value check
commit f197ac13f6eeb351b31250b9ab7d0da17434ea36 upstream.
In the ac.c, power_supply_register()'s return value is not checked.
As a result, the driver's add() ops may return success
even though the device failed to initialize.
For example, some BIOS may describe two ACADs in the same DSDT.
The second ACAD device will fail to register,
but ACPI driver's add() ops returns sucessfully.
The ACPI device will receive ACPI notification and cause OOPS.
https://bugzilla.redhat.com/show_bug.cgi?id=772730
Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/acpi/ac.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c index 6512b20aecc..d1fcbc0f6cb 100644 --- a/drivers/acpi/ac.c +++ b/drivers/acpi/ac.c @@ -292,7 +292,9 @@ static int acpi_ac_add(struct acpi_device *device) ac->charger.properties = ac_props; ac->charger.num_properties = ARRAY_SIZE(ac_props); ac->charger.get_property = get_ac_property; - power_supply_register(&ac->device->dev, &ac->charger); + result = power_supply_register(&ac->device->dev, &ac->charger); + if (result) + goto end; printk(KERN_INFO PREFIX "%s [%s] (%s)\n", acpi_device_name(device), acpi_device_bid(device), |