diff options
author | Kyle McMartin <kyle@redhat.com> | 2010-12-15 08:06:26 -0500 |
---|---|---|
committer | Kyle McMartin <kyle@redhat.com> | 2010-12-15 08:06:26 -0500 |
commit | b3c92af65782609ad3e2341f9a14b50887f79d4d (patch) | |
tree | 5701354e66ef3033553e5f895e0abc2cae39269f /orinoco-initialise-priv_hw-before-assigning-the-interrupt.patch | |
parent | 1f623e9fd56d03013ef0f68719d4647487eaee05 (diff) | |
download | kernel-b3c92af65782609ad3e2341f9a14b50887f79d4d.tar.gz kernel-b3c92af65782609ad3e2341f9a14b50887f79d4d.tar.xz kernel-b3c92af65782609ad3e2341f9a14b50887f79d4d.zip |
update to 2.6.37-rc5-git5
Diffstat (limited to 'orinoco-initialise-priv_hw-before-assigning-the-interrupt.patch')
-rw-r--r-- | orinoco-initialise-priv_hw-before-assigning-the-interrupt.patch | 91 |
1 files changed, 0 insertions, 91 deletions
diff --git a/orinoco-initialise-priv_hw-before-assigning-the-interrupt.patch b/orinoco-initialise-priv_hw-before-assigning-the-interrupt.patch deleted file mode 100644 index 7461d29a3..000000000 --- a/orinoco-initialise-priv_hw-before-assigning-the-interrupt.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 17f1e34b178ffc0111d768f48a86b58fd0c88c56 Mon Sep 17 00:00:00 2001 -From: David Kilroy <kilroyd@googlemail.com> -Date: Tue, 7 Dec 2010 18:50:42 +0000 -Subject: [PATCH] orinoco: initialise priv->hw before assigning the interrupt - -The interrupt handler takes a lock - but since commit bcad6e80f3f 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: John W. Linville <linville@tuxdriver.com> ---- - drivers/net/wireless/orinoco/orinoco_cs.c | 14 +++++++------- - drivers/net/wireless/orinoco/spectrum_cs.c | 14 +++++++------- - 2 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/drivers/net/wireless/orinoco/orinoco_cs.c b/drivers/net/wireless/orinoco/orinoco_cs.c -index 71b3d68..32954c4 100644 ---- a/drivers/net/wireless/orinoco/orinoco_cs.c -+++ b/drivers/net/wireless/orinoco/orinoco_cs.c -@@ -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; -diff --git a/drivers/net/wireless/orinoco/spectrum_cs.c b/drivers/net/wireless/orinoco/spectrum_cs.c -index fb859a5..db34c28 100644 ---- a/drivers/net/wireless/orinoco/spectrum_cs.c -+++ b/drivers/net/wireless/orinoco/spectrum_cs.c -@@ -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; --- -1.7.3.3 - |