Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3255ec4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 60d7ef3f d95dc9e3

drivers/hsi/clients/nokia-modem.c

+4 −4
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include <linux/of_gpio.h>

#include <linux/hsi/ssi_protocol.h>



static unsigned int pm;

static unsigned int pm = 1;

module_param(pm, int, 0400);

MODULE_PARM_DESC(pm,

	"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);



	irq = irq_of_parse_and_map(np, 0);

	if (irq < 0) {

	if (!irq) {

		dev_err(dev, "Invalid rst_ind interrupt (%d)\n", irq);

		return irq;

		return -EINVAL;

	}

	modem->nokia_modem_rst_ind_irq = 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,

			do_nokia_modem_rst_ind_tasklet, (unsigned long)modem);

	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) {

		dev_err(dev, "Request rst_ind irq(%d) failed (flags %d)\n",

								irq, pflags);

drivers/hsi/controllers/omap_ssi_port.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

	}