mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
* misc. fixes in omap-ssi and nokia-modem drivers
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABCgAGBQJUjvvFAAoJENju1/PIO/qazS4P+wTu99qNxnCbzLWSgwK5G/h3 hlrJkBYOpRo9fgZxRLmm6fSyjRU/M6UlPOl0FypXaBtoaSoBy75g6kz/kgjnW/j+ pRuADnHNtSGGTczR1X7VcC/sx1Si8fNEa2e7MNp+oeCaPDCx4oDXf4deo/u0uNO2 8Rb0r3pDVZuTwF+IQzQNbwNCRWHXFZfp+u05oCCwmAbN7TpeFbSBKUns+pz4kRoW sBqWh6ZT44UXp5J+Fr1ZlnqNLLLYLznJjG0db5i0wSXTeRtNXfq6Bd0Y87JwZR/J 3qhGpoL9AGGbb5FtnIjTX4wsehCWaxAAJ7SzE1023+0M0rrNlCX5KgQcVExRSb0/ Vap/mPrcoDPsxzxt/AeOFJoV4tREGr2zAYDS8jqxOj2uZtq7ITcAQdKsUSX/3rC7 bG4DwolcJVOhGWq2N1mLOH7KuAvZpCkRyz2xY5+zaST7oG78o5MPYmZqFSezAnX0 oKpK+hMQ4o8Mxmdaw1/geCptifTh3jjWxz1WAefho+KRsLl6bUSpczkGuszTn81f FnScfTXJ5mNAzIzGmJRKcqMPptzJozgv//q2m7rlUzHNsV+0W6Pg2wrUvorflMz3 2wee7NXUzAf0MzBTFMcprlQ7LVJDddlKlBeocBFEBWs1DIVd4B8Cr/DbS8+zWO6h KVrTVTAnF4qqmKB40luz =t4m3 -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
d3255ec483
2 changed files with 5 additions and 6 deletions
|
@ -29,7 +29,7 @@
|
||||||
#include <linux/of_gpio.h>
|
#include <linux/of_gpio.h>
|
||||||
#include <linux/hsi/ssi_protocol.h>
|
#include <linux/hsi/ssi_protocol.h>
|
||||||
|
|
||||||
static unsigned int pm;
|
static unsigned int pm = 1;
|
||||||
module_param(pm, int, 0400);
|
module_param(pm, int, 0400);
|
||||||
MODULE_PARM_DESC(pm,
|
MODULE_PARM_DESC(pm,
|
||||||
"Enable power management (0=disabled, 1=userland based [default])");
|
"Enable power management (0=disabled, 1=userland based [default])");
|
||||||
|
@ -164,9 +164,9 @@ static int nokia_modem_probe(struct device *dev)
|
||||||
dev_set_drvdata(dev, modem);
|
dev_set_drvdata(dev, modem);
|
||||||
|
|
||||||
irq = irq_of_parse_and_map(np, 0);
|
irq = irq_of_parse_and_map(np, 0);
|
||||||
if (irq < 0) {
|
if (!irq) {
|
||||||
dev_err(dev, "Invalid rst_ind interrupt (%d)\n", irq);
|
dev_err(dev, "Invalid rst_ind interrupt (%d)\n", irq);
|
||||||
return irq;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
modem->nokia_modem_rst_ind_irq = irq;
|
modem->nokia_modem_rst_ind_irq = irq;
|
||||||
pflags = irq_get_trigger_type(irq);
|
pflags = irq_get_trigger_type(irq);
|
||||||
|
@ -174,7 +174,7 @@ static int nokia_modem_probe(struct device *dev)
|
||||||
tasklet_init(&modem->nokia_modem_rst_ind_tasklet,
|
tasklet_init(&modem->nokia_modem_rst_ind_tasklet,
|
||||||
do_nokia_modem_rst_ind_tasklet, (unsigned long)modem);
|
do_nokia_modem_rst_ind_tasklet, (unsigned long)modem);
|
||||||
err = devm_request_irq(dev, irq, nokia_modem_rst_ind_isr,
|
err = devm_request_irq(dev, irq, nokia_modem_rst_ind_isr,
|
||||||
IRQF_DISABLED | pflags, "modem_rst_ind", modem);
|
pflags, "modem_rst_ind", modem);
|
||||||
if (err < 0) {
|
if (err < 0) {
|
||||||
dev_err(dev, "Request rst_ind irq(%d) failed (flags %d)\n",
|
dev_err(dev, "Request rst_ind irq(%d) failed (flags %d)\n",
|
||||||
irq, pflags);
|
irq, pflags);
|
||||||
|
|
|
@ -1118,8 +1118,7 @@ static int __init ssi_port_probe(struct platform_device *pd)
|
||||||
dev_dbg(&pd->dev, "init ssi port...\n");
|
dev_dbg(&pd->dev, "init ssi port...\n");
|
||||||
|
|
||||||
if (!try_module_get(ssi->owner)) {
|
if (!try_module_get(ssi->owner)) {
|
||||||
dev_err(&pd->dev, "could not increment parent module refcount (err=%d)\n",
|
dev_err(&pd->dev, "could not increment parent module refcount\n");
|
||||||
err);
|
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue