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

Commit d871c321 authored Nov 16, 2017 by David S. Miller

Merge branch 'isdn-hisax-Fix-pnp_irq-error-checking'



Arvind Yadav says:

====================
isdn: hisax: Fix pnp_irq's error checking

The pnp_irq() function returns -1 if an error occurs.
pnp_irq() error checking for zero is not correct.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

parents d618d09a 20525563

drivers/isdn/hisax/asuscom.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -348,7 +348,7 @@ int setup_asuscom(struct IsdnCard *card)
		}
		card->para[1] = pnp_port_start(pnp_d, 0);
		card->para[0] = pnp_irq(pnp_d, 0);
		if (!card->para[0] \|\| !card->para[1]) {
		if (card->para[0] == -1 \|\| !card->para[1]) {
		printk(KERN_ERR "AsusPnP:some resources are missing %ld/%lx\n",
		card->para[0], card->para[1]);
		pnp_disable_dev(pnp_d);

drivers/isdn/hisax/avm_pci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -805,7 +805,7 @@ static int avm_pnp_setup(struct IsdnCardState *cs)
		cs->hw.avm.cfg_reg =
		pnp_port_start(pnp_avm_d, 0);
		cs->irq = pnp_irq(pnp_avm_d, 0);
		if (!cs->irq) {
		if (cs->irq == -1) {
		printk(KERN_ERR "FritzPnP:No IRQ\n");
		return (0);
		}

drivers/isdn/hisax/diva.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1093,7 +1093,7 @@ static int setup_diva_isapnp(struct IsdnCard *card)
		}
		card->para[1] = pnp_port_start(pnp_d, 0);
		card->para[0] = pnp_irq(pnp_d, 0);
		if (!card->para[0] \|\| !card->para[1]) {
		if (card->para[0] == -1 \|\| !card->para[1]) {
		printk(KERN_ERR "Diva PnP:some resources are missing %ld/%lx\n",
		card->para[0], card->para[1]);
		pnp_disable_dev(pnp_d);

drivers/isdn/hisax/elsa.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -945,7 +945,7 @@ static int setup_elsa_isapnp(struct IsdnCard *card)
		card->para[1] = pnp_port_start(pnp_d, 0);
		card->para[0] = pnp_irq(pnp_d, 0);

		if (!card->para[0] \|\| !card->para[1]) {
		if (card->para[0] == -1 \|\| !card->para[1]) {
		printk(KERN_ERR "Elsa PnP:some resources are missing %ld/%lx\n",
		card->para[0], card->para[1]);
		pnp_disable_dev(pnp_d);

drivers/isdn/hisax/hfc_sx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1423,7 +1423,7 @@ int setup_hfcsx(struct IsdnCard *card)
		}
		card->para[1] = pnp_port_start(pnp_d, 0);
		card->para[0] = pnp_irq(pnp_d, 0);
		if (!card->para[0] \|\| !card->para[1]) {
		if (card->para[0] == -1 \|\| !card->para[1]) {
		printk(KERN_ERR "HFC PnP:some resources are missing %ld/%lx\n",
		card->para[0], card->para[1]);
		pnp_disable_dev(pnp_d);