Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 226961
b: refs/heads/master
c: 16325f1
h: refs/heads/master
i:
  226959: 16de3f8
v: v3
  • Loading branch information
Tobias Ollmann authored and Greg Kroah-Hartman committed Dec 10, 2010
1 parent 39de403 commit 808b1b7
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 34404082bbdc5d981fa8eb2f9f5dfaae74463877
refs/heads/master: 16325f18eaa6066c4b913a5661fc8190ce564f7c
12 changes: 7 additions & 5 deletions trunk/drivers/usb/host/uhci-q.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ static void uhci_set_next_interrupt(struct uhci_hcd *uhci)
{
if (uhci->is_stopped)
mod_timer(&uhci_to_hcd(uhci)->rh_timer, jiffies);
uhci->term_td->status |= cpu_to_le32(TD_CTRL_IOC);
uhci->term_td->status |= cpu_to_le32(TD_CTRL_IOC);
}

static inline void uhci_clear_next_interrupt(struct uhci_hcd *uhci)
Expand Down Expand Up @@ -195,7 +195,9 @@ static inline void uhci_remove_td_from_frame_list(struct uhci_hcd *uhci,
} else {
struct uhci_td *ntd;

ntd = list_entry(td->fl_list.next, struct uhci_td, fl_list);
ntd = list_entry(td->fl_list.next,
struct uhci_td,
fl_list);
uhci->frame[td->frame] = LINK_TO_TD(ntd);
uhci->frame_cpu[td->frame] = ntd;
}
Expand Down Expand Up @@ -728,7 +730,7 @@ static inline struct urb_priv *uhci_alloc_urb_priv(struct uhci_hcd *uhci,

urbp->urb = urb;
urb->hcpriv = urbp;

INIT_LIST_HEAD(&urbp->node);
INIT_LIST_HEAD(&urbp->td_list);

Expand Down Expand Up @@ -846,7 +848,7 @@ static int uhci_submit_control(struct uhci_hcd *uhci, struct urb *urb,

/* Alternate Data0/1 (start with Data1) */
destination ^= TD_TOKEN_TOGGLE;

uhci_add_td_to_urbp(td, urbp);
uhci_fill_td(td, status, destination | uhci_explen(pktsze),
data);
Expand All @@ -857,7 +859,7 @@ static int uhci_submit_control(struct uhci_hcd *uhci, struct urb *urb,
}

/*
* Build the final TD for control status
* Build the final TD for control status
*/
td = uhci_alloc_td(uhci);
if (!td)
Expand Down

0 comments on commit 808b1b7

Please sign in to comment.