git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
drivers
/
usb
/
host
/
ehci-sched.c
diff --git
a/drivers/usb/host/ehci-sched.c
b/drivers/usb/host/ehci-sched.c
index
c2104ca
..
9af4f64
100644
(file)
--- a/
drivers/usb/host/ehci-sched.c
+++ b/
drivers/usb/host/ehci-sched.c
@@
-588,7
+588,7
@@
static int intr_submit (
struct usb_host_endpoint *ep,
struct urb *urb,
struct list_head *qtd_list,
struct usb_host_endpoint *ep,
struct urb *urb,
struct list_head *qtd_list,
-
int
mem_flags
+
unsigned
mem_flags
) {
unsigned epnum;
unsigned long flags;
) {
unsigned epnum;
unsigned long flags;
@@
-633,7
+633,7
@@
done:
/* ehci_iso_stream ops work with both ITD and SITD */
static struct ehci_iso_stream *
/* ehci_iso_stream ops work with both ITD and SITD */
static struct ehci_iso_stream *
-iso_stream_alloc (
int
mem_flags)
+iso_stream_alloc (
unsigned
mem_flags)
{
struct ehci_iso_stream *stream;
{
struct ehci_iso_stream *stream;
@@
-846,7
+846,7
@@
iso_stream_find (struct ehci_hcd *ehci, struct urb *urb)
/* ehci_iso_sched ops can be ITD-only or SITD-only */
static struct ehci_iso_sched *
/* ehci_iso_sched ops can be ITD-only or SITD-only */
static struct ehci_iso_sched *
-iso_sched_alloc (unsigned packets,
int
mem_flags)
+iso_sched_alloc (unsigned packets,
unsigned
mem_flags)
{
struct ehci_iso_sched *iso_sched;
int size = sizeof *iso_sched;
{
struct ehci_iso_sched *iso_sched;
int size = sizeof *iso_sched;
@@
-919,7
+919,7
@@
itd_urb_transaction (
struct ehci_iso_stream *stream,
struct ehci_hcd *ehci,
struct urb *urb,
struct ehci_iso_stream *stream,
struct ehci_hcd *ehci,
struct urb *urb,
-
int
mem_flags
+
unsigned
mem_flags
)
{
struct ehci_itd *itd;
)
{
struct ehci_itd *itd;
@@
-1412,7
+1412,8
@@
itd_complete (
/*-------------------------------------------------------------------------*/
/*-------------------------------------------------------------------------*/
-static int itd_submit (struct ehci_hcd *ehci, struct urb *urb, int mem_flags)
+static int itd_submit (struct ehci_hcd *ehci, struct urb *urb,
+ unsigned mem_flags)
{
int status = -EINVAL;
unsigned long flags;
{
int status = -EINVAL;
unsigned long flags;
@@
-1523,7
+1524,7
@@
sitd_urb_transaction (
struct ehci_iso_stream *stream,
struct ehci_hcd *ehci,
struct urb *urb,
struct ehci_iso_stream *stream,
struct ehci_hcd *ehci,
struct urb *urb,
-
int
mem_flags
+
unsigned
mem_flags
)
{
struct ehci_sitd *sitd;
)
{
struct ehci_sitd *sitd;
@@
-1772,7
+1773,8
@@
sitd_complete (
}
}
-static int sitd_submit (struct ehci_hcd *ehci, struct urb *urb, int mem_flags)
+static int sitd_submit (struct ehci_hcd *ehci, struct urb *urb,
+ unsigned mem_flags)
{
int status = -EINVAL;
unsigned long flags;
{
int status = -EINVAL;
unsigned long flags;
@@
-1822,7
+1824,8
@@
done:
#else
static inline int
#else
static inline int
-sitd_submit (struct ehci_hcd *ehci, struct urb *urb, int mem_flags)
+sitd_submit (struct ehci_hcd *ehci, struct urb *urb,
+ unsigned mem_flags)
{
ehci_dbg (ehci, "split iso support is disabled\n");
return -ENOSYS;
{
ehci_dbg (ehci, "split iso support is disabled\n");
return -ENOSYS;