summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-02-11 08:43:59 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-11 08:43:59 -0800
commit6fc26fc5783add961533c819995bd97db05990f0 (patch)
treec0bc17cbdccd31a695dd29c828a41371c318b023 /drivers
parent13c071907b237058b38ac85b35742a543e522059 (diff)
parent67e9a2ce6e070b1e5db2dfe9c61890fc30ae954d (diff)
downloadlinux-6fc26fc5783add961533c819995bd97db05990f0.tar.bz2
Merge tag 'hsi-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
Pull HSI fix from Sebastian Reichel: "Fix uninitialized device pointer in nokia-modem" * tag 'hsi-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi: hsi: nokia-modem: fix uninitialized device pointer
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hsi/clients/nokia-modem.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hsi/clients/nokia-modem.c b/drivers/hsi/clients/nokia-modem.c
index f0c21458962c..eb4dc63dbc93 100644
--- a/drivers/hsi/clients/nokia-modem.c
+++ b/drivers/hsi/clients/nokia-modem.c
@@ -162,6 +162,7 @@ static int nokia_modem_probe(struct device *dev)
return -ENOMEM;
}
dev_set_drvdata(dev, modem);
+ modem->device = dev;
irq = irq_of_parse_and_map(np, 0);
if (!irq) {