diff options
author | Takashi Iwai <tiwai@suse.de> | 2017-01-11 19:49:27 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-01-11 19:49:27 +0100 |
commit | 6cf4569ce3561dec560147e6051959d6896b23d1 (patch) | |
tree | 2b3dca47673824975c35a708a6d9d24ff46a2771 /drivers/acpi/acpi_watchdog.c | |
parent | 2e40795c3bf344cfb5220d94566205796e3ef19a (diff) | |
parent | 42e0ebdef53d91891939a475c6ef23970829ff99 (diff) |
Merge tag 'asoc-fix-v4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linussound-4.10-rc4
ASoC: Fixes for v4.10
As well as the usual smattering of driver specific fixes collected since
the merge window this has one particularly important fix to the core for
handling of aux_devs which was broken during the merge window by some of
the componentization refactoring.
Diffstat (limited to 'drivers/acpi/acpi_watchdog.c')
-rw-r--r-- | drivers/acpi/acpi_watchdog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpi_watchdog.c b/drivers/acpi/acpi_watchdog.c index 13caebd679f5..8c4e0a18460a 100644 --- a/drivers/acpi/acpi_watchdog.c +++ b/drivers/acpi/acpi_watchdog.c @@ -114,7 +114,7 @@ void __init acpi_watchdog_init(void) pdev = platform_device_register_simple("wdat_wdt", PLATFORM_DEVID_NONE, resources, nresources); if (IS_ERR(pdev)) - pr_err("Failed to create platform device\n"); + pr_err("Device creation failed: %ld\n", PTR_ERR(pdev)); kfree(resources); |