History

Merge branch 'i2c/for-current-fixed' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c fixes from Wolfram Sang: "A set of driver and core fixes as well as MAINTAINER update" * 'i2c/for-current-fixed' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: MAINTAINERS: add maintainer for mediatek i2c controller driver i2c: mux: Replace zero-length array with flexible-array i2c: mux: demux-pinctrl: Fix an error handling path in 'i2c_demux_pinctrl_probe()' i2c: altera: Fix race between xfer_msg and isr thread i2c: algo-pca: update contact email i2c: at91: Fix pinmux after devm_gpiod_get() for bus recovery i2c: use my kernel.org address from now on i2c: fix missing pm_runtime_put_sync in i2c_device_probe

Linus Torvalds committed 6 years ago

Commit 03fb3ac2 parents 97076ea efa7fb410 files · +58 −16Browse files

Showing the changes to include/linux (2 of 10 files). Show all

Unified · Split

2 files
  1. include/linux/i2c-mux.h +1 −1
  2. include/linux/i2c.h +1 −1
include/linux/i2c-mux.h+1−1
@@ -29,7 +29,7 @@ struct i2c_mux_core { · 28 unmodified lines
29 29
30 int num_adapters;30 int num_adapters;
31 int max_adapters;31 int max_adapters;
32 struct i2c_adapter *adapter[0];32 struct i2c_adapter *adapter[];
33};33};
34 34
35struct i2c_mux_core *i2c_mux_alloc(struct i2c_adapter *parent,35struct i2c_mux_core *i2c_mux_alloc(struct i2c_adapter *parent,
include/linux/i2c.h+1−1
@@ -2,7 +2,7 @@ · 1 unmodified line
2/*2/*
3 * i2c.h - definitions for the Linux i2c bus interface3 * i2c.h - definitions for the Linux i2c bus interface
4 * Copyright (C) 1995-2000 Simon G. Vogl4 * Copyright (C) 1995-2000 Simon G. Vogl
5 * Copyright (C) 2013-2019 Wolfram Sang <wsa@the-dreams.de>5 * Copyright (C) 2013-2019 Wolfram Sang <wsa@kernel.org>
6 *6 *
7 * With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and7 * With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and
8 * Frodo Looijaard <frodol@dds.nl>8 * Frodo Looijaard <frodol@dds.nl>

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t