Attachment #271659 for bug #352513

View | Details | Raw Unified | Return to bug 352513
Collapse All | Expand All

Lines 949-954 int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev) Link Here

(-)a/drivers/net/wireless/rt2x00/rt2x00dev.c (+1 lines)
949	{	949	{
950	int retval = -ENOMEM;	950	int retval = -ENOMEM;
951		951
		952	spin_lock_init(&rt2x00dev->irqmask_lock);
952	mutex_init(&rt2x00dev->csr_mutex);	953	mutex_init(&rt2x00dev->csr_mutex);
953		954
954	set_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags);	955	set_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags);

Lines 327-335 void rt2x00pci_remove(struct pci_dev *pci_dev) Link Here

(-)a/drivers/net/wireless/rt2x00/rt2x00pci.c (+2 lines)
327	/*	327	/*
328	* Free all allocated data.	328	* Free all allocated data.
329	*/	329	*/
		330	spin_lock_irq(&rt2x00dev->irqmask_lock);
330	rt2x00lib_remove_dev(rt2x00dev);	331	rt2x00lib_remove_dev(rt2x00dev);
331	rt2x00pci_free_reg(rt2x00dev);	332	rt2x00pci_free_reg(rt2x00dev);
332	ieee80211_free_hw(hw);	333	ieee80211_free_hw(hw);
		334	spin_unlock_irq(&rt2x00dev->irqmask_lock);
333	/*	335	/*
334	* Free the PCI device data.	336	* Free the PCI device data.
335	*/	337	*/

Lines 2258-2263 static irqreturn_t rt61pci_interrupt_thread(int irq, void *dev_instance) Link Here

(-)a/drivers/net/wireless/rt2x00/rt61pci.c (+2 lines)
2258	/* Enable interrupts again. */	2258	/* Enable interrupts again. */
2259	rt2x00dev->ops->lib->set_device_state(rt2x00dev,	2259	rt2x00dev->ops->lib->set_device_state(rt2x00dev,
2260	STATE_RADIO_IRQ_ON_ISR);	2260	STATE_RADIO_IRQ_ON_ISR);
		2261	spin_unlock(&rt2x00dev->irqmask_lock);
2261	return IRQ_HANDLED;	2262	return IRQ_HANDLED;
2262	}	2263	}
2263		2264
Lines 2268-2273 static irqreturn_t rt61pci_interrupt(int irq, void *dev_instance) Link Here
2268	u32 reg_mcu;	2269	u32 reg_mcu;
2269	u32 reg;	2270	u32 reg;
2270		2271
		2272	spin_lock(&rt2x00dev->irqmask_lock);
2271	/*	2273	/*
2272	* Get the interrupt sources & saved to local variable.	2274	* Get the interrupt sources & saved to local variable.
2273	* Write register value back to clear pending interrupts.	2275	* Write register value back to clear pending interrupts.

Return to bug 352513