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

Commit 442258e2 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

USB: use IRQF_DISABLED for HCD interrupt handlers 



Host controller IRQs are supposed to be serviced with interrupts
disabled.  This patch (as1026) adds an IRQF_DISABLED flag to all the
controller drivers that lack it.  It also replaces the
spin_lock_irqsave() and spin_unlock_irqrestore() calls in uhci_irq()
with simple spin_lock() and spin_unlock().

This fixes Bugzilla #9335.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Acked-by: default avatarDavid Brownell <david-b@pacbell.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d48bd977

drivers/usb/core/hcd-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ int usb_hcd_pci_probe (struct pci_dev *dev, const struct pci_device_id *id) 


	pci_set_master (dev);



	retval = usb_add_hcd (hcd, dev->irq, IRQF_SHARED);

	retval = usb_add_hcd(hcd, dev->irq, IRQF_DISABLED | IRQF_SHARED);

	if (retval != 0)

		goto err4;

	return retval;

drivers/usb/host/ehci-fsl.c

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ int usb_hcd_fsl_probe(const struct hc_driver *driver, 
	temp = in_le32(hcd->regs + 0x1a8);

	out_le32(hcd->regs + 0x1a8, temp | 0x3);



	retval = usb_add_hcd(hcd, irq, IRQF_SHARED);

	retval = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);

	if (retval != 0)

		goto err4;

	return retval;

drivers/usb/host/ohci-ppc-of.c

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ ohci_hcd_ppc_of_probe(struct of_device *op, const struct of_device_id *match) 


	ohci_hcd_init(ohci);



	rv = usb_add_hcd(hcd, irq, 0);

	rv = usb_add_hcd(hcd, irq, IRQF_DISABLED);

	if (rv == 0)

		return 0;

drivers/usb/host/ohci-ssb.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static int ssb_ohci_attach(struct ssb_device *dev) 
	hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len);

	if (!hcd->regs)

		goto err_put_hcd;

	err = usb_add_hcd(hcd, dev->irq, IRQF_SHARED);

	err = usb_add_hcd(hcd, dev->irq, IRQF_DISABLED | IRQF_SHARED);

	if (err)

		goto err_iounmap;

drivers/usb/host/r8a66597-hcd.c

+1 −1
Original line number Diff line number Diff line
@@ -2197,7 +2197,7 @@ static int __init r8a66597_probe(struct platform_device *pdev) 
	INIT_LIST_HEAD(&r8a66597->child_device);



	hcd->rsrc_start = res->start;

	ret = usb_add_hcd(hcd, irq, 0);

	ret = usb_add_hcd(hcd, irq, IRQF_DISABLED);

	if (ret != 0) {

		err("Failed to add hcd");

		goto clean_up;