git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
usb
/
host
/
ohci-omap.c
diff --git
a/drivers/usb/host/ohci-omap.c
b/drivers/usb/host/ohci-omap.c
index
c4c4bab
..
3785b3f
100644
(file)
--- a/
drivers/usb/host/ohci-omap.c
+++ b/
drivers/usb/host/ohci-omap.c
@@
-14,7
+14,7
@@
* This file is licenced under the GPL.
*/
* This file is licenced under the GPL.
*/
-#include <linux/signal.h> /*
IRQF_DISABLED
*/
+#include <linux/signal.h> /*
SA_INTERRUPT
*/
#include <linux/jiffies.h>
#include <linux/platform_device.h>
#include <linux/clk.h>
#include <linux/jiffies.h>
#include <linux/platform_device.h>
#include <linux/clk.h>
@@
-286,7
+286,7
@@
void usb_hcd_omap_remove (struct usb_hcd *, struct platform_device *);
int usb_hcd_omap_probe (const struct hc_driver *driver,
struct platform_device *pdev)
{
int usb_hcd_omap_probe (const struct hc_driver *driver,
struct platform_device *pdev)
{
- int retval
, irq
;
+ int retval;
struct usb_hcd *hcd = 0;
struct ohci_hcd *ohci;
struct usb_hcd *hcd = 0;
struct ohci_hcd *ohci;
@@
-329,12
+329,7
@@
int usb_hcd_omap_probe (const struct hc_driver *driver,
if (retval < 0)
goto err2;
if (retval < 0)
goto err2;
- irq = platform_get_irq(pdev, 0);
- if (irq < 0) {
- retval = -ENXIO;
- goto err2;
- }
- retval = usb_add_hcd(hcd, irq, IRQF_DISABLED);
+ retval = usb_add_hcd(hcd, platform_get_irq(pdev, 0), SA_INTERRUPT);
if (retval == 0)
return retval;
if (retval == 0)
return retval;