diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-11 08:43:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-11 08:43:59 -0800 |
| commit | 6fc26fc5783add961533c819995bd97db05990f0 (patch) | |
| tree | c0bc17cbdccd31a695dd29c828a41371c318b023 | |
| parent | Merge tag 'for-v3.20' of git://git.infradead.org/battery-2.6 (diff) | |
| parent | hsi: nokia-modem: fix uninitialized device pointer (diff) | |
| download | linux-dev-6fc26fc5783add961533c819995bd97db05990f0.tar.xz linux-dev-6fc26fc5783add961533c819995bd97db05990f0.zip | |
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
| -rw-r--r-- | drivers/hsi/clients/nokia-modem.c | 1 |
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) { |