diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-20 19:17:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-20 19:17:35 -0800 |
| commit | 4f7a4028d8b48d1dc6b51b0737087f5e3c16c336 (patch) | |
| tree | 3b2f23561ff90e2392d0ea3f33162b254d6b02b1 /arch/x86/platform/intel-mid/device_libs/platform_bt.c | |
| parent | b9cdab6820ae740dad1e87e609d78dbea7a297f2 (diff) | |
| parent | 604303018221d00b58422e1d117ba29ce84295cb (diff) | |
| download | linux-4f7a4028d8b48d1dc6b51b0737087f5e3c16c336.tar.gz linux-4f7a4028d8b48d1dc6b51b0737087f5e3c16c336.tar.bz2 linux-4f7a4028d8b48d1dc6b51b0737087f5e3c16c336.zip | |
Merge tag 'x86_platform_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 platform updates from Borislav Petkov:
- Convert geode drivers to look up the LED controls from a GPIO machine
descriptor table.
- Remove arch/x86/platform/goldfish as it is not used by the android
emulator anymore.
* tag 'x86_platform_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/platform/geode: Convert alix LED to GPIO machine descriptor
x86/platform/geode: Convert geode LED to GPIO machine descriptor
x86/platform/geode: Convert net5501 LED to GPIO machine descriptor
x86/platform: Retire arch/x86/platform/goldfish
x86/platform/intel-mid: Convert comma to semicolon
Diffstat (limited to 'arch/x86/platform/intel-mid/device_libs/platform_bt.c')
| -rw-r--r-- | arch/x86/platform/intel-mid/device_libs/platform_bt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_bt.c b/arch/x86/platform/intel-mid/device_libs/platform_bt.c index 31dda18bb370..2930b6e9473e 100644 --- a/arch/x86/platform/intel-mid/device_libs/platform_bt.c +++ b/arch/x86/platform/intel-mid/device_libs/platform_bt.c @@ -88,8 +88,8 @@ static int __init bt_sfi_init(void) memset(&info, 0, sizeof(info)); info.fwnode = ddata->dev->fwnode; info.parent = ddata->dev; - info.name = ddata->name, - info.id = PLATFORM_DEVID_NONE, + info.name = ddata->name; + info.id = PLATFORM_DEVID_NONE; pdev = platform_device_register_full(&info); if (IS_ERR(pdev)) |