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

Commit f30d2d24 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: xhci: Use correct device for DMA map/unmap calls" into msm-4.9

parents e851fd74 f556be0a

drivers/usb/host/xhci-ring.c

+2 −2
Original line number Diff line number Diff line
@@ -675,7 +675,7 @@ static void xhci_giveback_urb_in_irq(struct xhci_hcd *xhci, 
void xhci_unmap_td_bounce_buffer(struct xhci_hcd *xhci, struct xhci_ring *ring,

				 struct xhci_td *td)

{

	struct device *dev = xhci_to_hcd(xhci)->self.controller;

	struct device *dev = xhci_to_hcd(xhci)->self.sysdev;

	struct xhci_segment *seg = td->bounce_seg;

	struct urb *urb = td->urb;
@@ -3153,7 +3153,7 @@ static u32 xhci_td_remainder(struct xhci_hcd *xhci, int transferred, 
static int xhci_align_td(struct xhci_hcd *xhci, struct urb *urb, u32 enqd_len,

			 u32 *trb_buff_len, struct xhci_segment *seg)

{

	struct device *dev = xhci_to_hcd(xhci)->self.controller;

	struct device *dev = xhci_to_hcd(xhci)->self.sysdev;

	unsigned int unalign;

	unsigned int max_pkt;

	u32 new_buff_len;