diff options
| author | Vincent Donnefort | 2014-04-15 14:21:43 +0200 |
|---|---|---|
| committer | Linus Walleij | 2014-05-09 10:28:16 +0200 |
| commit | a7008ee1a423720e755e08f33b63669795c1f072 (patch) | |
| tree | 12d206359a90d55550e2bac25178dcdfde8c1272 | |
| parent | Linux 3.15-rc4 (diff) | |
| download | kernel-qcow2-linux-a7008ee1a423720e755e08f33b63669795c1f072.tar.gz kernel-qcow2-linux-a7008ee1a423720e755e08f33b63669795c1f072.tar.xz kernel-qcow2-linux-a7008ee1a423720e755e08f33b63669795c1f072.zip | |
gpio: ich: set regs and reglen for i3100 and ich6 chipset
This patch fixes kernel NULL pointer BUG introduced by the following commit:
b667cf488aa9476b0ab64acd91f2a96f188cfd21
gpio: ich: Add support for multiple register addresses.
Signed-off-by: Vincent Donnefort <vdonnefort@gmail.com>
Tested-by: Eric Paris <eparis@redhat.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| -rw-r--r-- | drivers/gpio/gpio-ich.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c index e73c6755a5eb..70304220a479 100644 --- a/drivers/gpio/gpio-ich.c +++ b/drivers/gpio/gpio-ich.c @@ -305,6 +305,8 @@ static struct ichx_desc ich6_desc = { .ngpio = 50, .have_blink = true, + .regs = ichx_regs, + .reglen = ichx_reglen, }; /* Intel 3100 */ @@ -324,6 +326,8 @@ static struct ichx_desc i3100_desc = { .uses_gpe0 = true, .ngpio = 50, + .regs = ichx_regs, + .reglen = ichx_reglen, }; /* ICH7 and ICH8-based */ |