Call udl_put_urb() to release an URB back into the URB cache. Replace udl_urb_completion() in error-handling code.
The URB completion handler runs in interrupt context after the USB subsystem has processed an URB. Do not call it from udl's error-handling logic. Signed-off-by: Thomas Zimmermann <[email protected]> --- drivers/gpu/drm/udl/udl_drv.h | 1 - drivers/gpu/drm/udl/udl_main.c | 4 ++-- drivers/gpu/drm/udl/udl_modeset.c | 2 +- drivers/gpu/drm/udl/udl_transfer.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h index 9535e9c59950..68c5a5feb6f3 100644 --- a/drivers/gpu/drm/udl/udl_drv.h +++ b/drivers/gpu/drm/udl/udl_drv.h @@ -77,7 +77,6 @@ void udl_put_urb(struct urb *urb); int udl_submit_urb(struct udl_device *udl, struct urb *urb, size_t len); void udl_sync_pending_urbs(struct udl_device *udl); -void udl_urb_completion(struct urb *urb); int udl_init(struct udl_device *udl); diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c index 936fb6565bdb..77b0bc560422 100644 --- a/drivers/gpu/drm/udl/udl_main.c +++ b/drivers/gpu/drm/udl/udl_main.c @@ -147,7 +147,7 @@ int udl_select_std_channel(struct udl_device *udl) return ret < 0 ? ret : 0; } -void udl_urb_completion(struct urb *urb) +static void udl_urb_completion(struct urb *urb) { /* sync/async unlink faults aren't errors */ if (urb->status) { @@ -312,7 +312,7 @@ int udl_submit_urb(struct udl_device *udl, struct urb *urb, size_t len) ret = usb_submit_urb(urb, GFP_ATOMIC); error: if (ret) { - udl_urb_completion(urb); /* because no one else will */ + udl_put_urb(urb); DRM_ERROR("usb_submit_urb error %x\n", ret); } return ret; diff --git a/drivers/gpu/drm/udl/udl_modeset.c b/drivers/gpu/drm/udl/udl_modeset.c index d8a617e2d2ea..bbba1dee8e4f 100644 --- a/drivers/gpu/drm/udl/udl_modeset.c +++ b/drivers/gpu/drm/udl/udl_modeset.c @@ -243,7 +243,7 @@ static int udl_handle_damage(struct drm_framebuffer *fb, len = cmd - (char *)urb->transfer_buffer; ret = udl_submit_urb(udl, urb, len); } else { - udl_urb_completion(urb); + udl_put_urb(urb); } return 0; diff --git a/drivers/gpu/drm/udl/udl_transfer.c b/drivers/gpu/drm/udl/udl_transfer.c index 7d670b3a5293..de8e673d1efa 100644 --- a/drivers/gpu/drm/udl/udl_transfer.c +++ b/drivers/gpu/drm/udl/udl_transfer.c @@ -183,7 +183,7 @@ int udl_render_hline(struct udl_device *udl, int log_bpp, struct urb **urb_ptr, if (WARN_ON(!(log_bpp == 1 || log_bpp == 2))) { /* need to finish URB at error from this function */ - udl_urb_completion(urb); + udl_put_urb(urb); return -EINVAL; } -- 2.56.0
