diff options
| author | Linus Torvalds | 2014-12-16 02:33:47 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2014-12-16 02:33:47 +0100 |
| commit | d3255ec483ca048192f6e8a8789e08e32b379b84 (patch) | |
| tree | 6581a6701069067834454b07bcebfd4360926f4d /drivers/hsi/controllers | |
| parent | Merge branch 'irq-irqdomain-arm-for-linus' of git://git.kernel.org/pub/scm/li... (diff) | |
| parent | HSI: nokia-modem: fix error handling of irq_of_parse_and_map (diff) | |
| download | kernel-qcow2-linux-d3255ec483ca048192f6e8a8789e08e32b379b84.tar.gz kernel-qcow2-linux-d3255ec483ca048192f6e8a8789e08e32b379b84.tar.xz kernel-qcow2-linux-d3255ec483ca048192f6e8a8789e08e32b379b84.zip | |
Merge tag 'hsi-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
Pull HSI update from Sebastian Reichel:
"Misc fixes in omap-ssi and nokia-modem drivers"
* tag 'hsi-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
HSI: nokia-modem: fix error handling of irq_of_parse_and_map
HSI: nokia-modem: setup default value for pm parameter
HSI: omap_ssi_port: Don't print uninitialized err
HSI: remove deprecated IRQF_DISABLED
Diffstat (limited to 'drivers/hsi/controllers')
| -rw-r--r-- | drivers/hsi/controllers/omap_ssi_port.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/hsi/controllers/omap_ssi_port.c b/drivers/hsi/controllers/omap_ssi_port.c index 1314ab80164b..1f8652b3de06 100644 --- a/drivers/hsi/controllers/omap_ssi_port.c +++ b/drivers/hsi/controllers/omap_ssi_port.c @@ -1118,8 +1118,7 @@ static int __init ssi_port_probe(struct platform_device *pd) dev_dbg(&pd->dev, "init ssi port...\n"); if (!try_module_get(ssi->owner)) { - dev_err(&pd->dev, "could not increment parent module refcount (err=%d)\n", - err); + dev_err(&pd->dev, "could not increment parent module refcount\n"); return -ENODEV; } |