Blame gpio-ich-set-regs-and-reglen-for-i3100-and-ich6-chipset.patch
|
 |
865dffb |
Bugzilla: N/A (Eric Paris reported via IRC)
|
|
|
865dffb |
Upstream-status: Sent for 3.15
|
|
|
865dffb |
|
|
|
865dffb |
From: Vincent Donnefort <vdonnefort@gmail.com>
|
|
|
865dffb |
|
|
|
865dffb |
This patch fixes kernel NULL pointer BUG introduced by the following commit:
|
|
|
865dffb |
b667cf488aa9476b0ab64acd91f2a96f188cfd21
|
|
|
865dffb |
gpio: ich: Add support for multiple register addresses.
|
|
|
865dffb |
|
|
|
865dffb |
Signed-off-by: Vincent Donnefort <vdonnefort@gmail.com>
|
|
|
865dffb |
|
|
|
865dffb |
diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
|
|
|
865dffb |
index e73c675..7030422 100644
|
|
|
865dffb |
--- a/drivers/gpio/gpio-ich.c
|
|
|
865dffb |
+++ b/drivers/gpio/gpio-ich.c
|
|
|
865dffb |
@@ -305,6 +305,8 @@ static struct ichx_desc ich6_desc = {
|
|
|
865dffb |
|
|
|
865dffb |
.ngpio = 50,
|
|
|
865dffb |
.have_blink = true,
|
|
|
865dffb |
+ .regs = ichx_regs,
|
|
|
865dffb |
+ .reglen = ichx_reglen,
|
|
|
865dffb |
};
|
|
|
865dffb |
|
|
|
865dffb |
/* Intel 3100 */
|
|
|
865dffb |
@@ -324,6 +326,8 @@ static struct ichx_desc i3100_desc = {
|
|
|
865dffb |
.uses_gpe0 = true,
|
|
|
865dffb |
|
|
|
865dffb |
.ngpio = 50,
|
|
|
865dffb |
+ .regs = ichx_regs,
|
|
|
865dffb |
+ .reglen = ichx_reglen,
|
|
|
865dffb |
};
|
|
|
865dffb |
|
|
|
865dffb |
/* ICH7 and ICH8-based */
|
|
|
865dffb |
--
|
|
|
865dffb |
1.8.3.2
|