|
@@ -197,8 +197,6 @@ static int usbhsg_dma_map_ctrl(struct device *dma_dev, struct usbhs_pkt *pkt,
|
|
struct usbhsg_request *ureq = usbhsg_pkt_to_ureq(pkt);
|
|
struct usbhsg_request *ureq = usbhsg_pkt_to_ureq(pkt);
|
|
struct usb_request *req = &ureq->req;
|
|
struct usb_request *req = &ureq->req;
|
|
struct usbhs_pipe *pipe = pkt->pipe;
|
|
struct usbhs_pipe *pipe = pkt->pipe;
|
|
- struct usbhsg_uep *uep = usbhsg_pipe_to_uep(pipe);
|
|
|
|
- struct usbhsg_gpriv *gpriv = usbhsg_uep_to_gpriv(uep);
|
|
|
|
enum dma_data_direction dir;
|
|
enum dma_data_direction dir;
|
|
int ret = 0;
|
|
int ret = 0;
|
|
|
|
|
|
@@ -208,13 +206,13 @@ static int usbhsg_dma_map_ctrl(struct device *dma_dev, struct usbhs_pkt *pkt,
|
|
/* it can not use scatter/gather */
|
|
/* it can not use scatter/gather */
|
|
WARN_ON(req->num_sgs);
|
|
WARN_ON(req->num_sgs);
|
|
|
|
|
|
- ret = usb_gadget_map_request(&gpriv->gadget, req, dir);
|
|
|
|
|
|
+ ret = usb_gadget_map_request_by_dev(dma_dev, req, dir);
|
|
if (ret < 0)
|
|
if (ret < 0)
|
|
return ret;
|
|
return ret;
|
|
|
|
|
|
pkt->dma = req->dma;
|
|
pkt->dma = req->dma;
|
|
} else {
|
|
} else {
|
|
- usb_gadget_unmap_request(&gpriv->gadget, req, dir);
|
|
|
|
|
|
+ usb_gadget_unmap_request_by_dev(dma_dev, req, dir);
|
|
}
|
|
}
|
|
|
|
|
|
return ret;
|
|
return ret;
|