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

Commit 229bd792 authored by David Kilroy's avatar David Kilroy Committed by John W. Linville
Browse files

orinoco: initialise priv->hw before assigning the interrupt 

The interrupt handler takes a lock - but since commit bcad6e80 this
lock goes through an indirection specified in the hermes_t structure.
We must therefore initialise the structure before setting up the
interrupt handler.

Fix orinoco_cs and spectrum_cs

<https://bugzilla.kernel.org/show_bug.cgi?id=23932

>

Bisected by: Matt Domsch <Matt_Domsch@dell.com>
Signed-off by: David Kilroy <kilroyd@googlemail.com>
Cc: stable@kernel.org
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 884a963f

drivers/net/wireless/orinoco/orinoco_cs.c

+7 −7
Original line number Diff line number Diff line
@@ -151,20 +151,20 @@ orinoco_cs_config(struct pcmcia_device *link) 
		goto failed;

	}



	ret = pcmcia_request_irq(link, orinoco_interrupt);

	if (ret)

		goto failed;



	/* We initialize the hermes structure before completing PCMCIA

	 * configuration just in case the interrupt handler gets

	 * called. */

	mem = ioport_map(link->resource[0]->start,

			resource_size(link->resource[0]));

	if (!mem)

		goto failed;



	/* We initialize the hermes structure before completing PCMCIA

	 * configuration just in case the interrupt handler gets

	 * called. */

	hermes_struct_init(hw, mem, HERMES_16BIT_REGSPACING);



	ret = pcmcia_request_irq(link, orinoco_interrupt);

	if (ret)

		goto failed;



	ret = pcmcia_enable_device(link);

	if (ret)

		goto failed;

drivers/net/wireless/orinoco/spectrum_cs.c

+7 −7
Original line number Diff line number Diff line
@@ -214,21 +214,21 @@ spectrum_cs_config(struct pcmcia_device *link) 
		goto failed;

	}



	ret = pcmcia_request_irq(link, orinoco_interrupt);

	if (ret)

		goto failed;



	/* We initialize the hermes structure before completing PCMCIA

	 * configuration just in case the interrupt handler gets

	 * called. */

	mem = ioport_map(link->resource[0]->start,

			resource_size(link->resource[0]));

	if (!mem)

		goto failed;



	/* We initialize the hermes structure before completing PCMCIA

	 * configuration just in case the interrupt handler gets

	 * called. */

	hermes_struct_init(hw, mem, HERMES_16BIT_REGSPACING);

	hw->eeprom_pda = true;



	ret = pcmcia_request_irq(link, orinoco_interrupt);

	if (ret)

		goto failed;



	ret = pcmcia_enable_device(link);

	if (ret)

		goto failed;