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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
usb
/
host
/
isp116x-hcd.c
diff --git
a/drivers/usb/host/isp116x-hcd.c
b/drivers/usb/host/isp116x-hcd.c
index
e99210b
..
8c6b38a
100644
(file)
--- a/
drivers/usb/host/isp116x-hcd.c
+++ b/
drivers/usb/host/isp116x-hcd.c
@@
-63,7
+63,7
@@
#include <linux/init.h>
#include <linux/list.h>
#include <linux/usb.h>
#include <linux/init.h>
#include <linux/list.h>
#include <linux/usb.h>
-#include <linux/usb
_
isp116x.h>
+#include <linux/usb
/
isp116x.h>
#include <linux/platform_device.h>
#include <asm/io.h>
#include <linux/platform_device.h>
#include <asm/io.h>
@@
-781,7
+781,7
@@
static int isp116x_urb_enqueue(struct usb_hcd *hcd,
if (ep->branch < PERIODIC_SIZE)
break;
if (ep->branch < PERIODIC_SIZE)
break;
-
ret = ep->branch
= balance(isp116x, ep->period, ep->load);
+
ep->branch = ret
= balance(isp116x, ep->period, ep->load);
if (ret < 0)
goto fail;
ret = 0;
if (ret < 0)
goto fail;
ret = 0;
@@
-1204,7
+1204,7
@@
static int isp116x_show_dbg(struct seq_file *s, void *unused)
static int isp116x_open_seq(struct inode *inode, struct file *file)
{
static int isp116x_open_seq(struct inode *inode, struct file *file)
{
- return single_open(file, isp116x_show_dbg, inode->
u.generic_ip
);
+ return single_open(file, isp116x_show_dbg, inode->
i_private
);
}
static struct file_operations isp116x_debug_fops = {
}
static struct file_operations isp116x_debug_fops = {
@@
-1653,7
+1653,7
@@
static int __init isp116x_probe(struct platform_device *pdev)
goto err6;
}
goto err6;
}
- ret = usb_add_hcd(hcd, irq,
SA_INTERRUPT
);
+ ret = usb_add_hcd(hcd, irq,
IRQF_DISABLED
);
if (ret)
goto err6;
if (ret)
goto err6;