diff options
| author |   Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2013-04-23 17:11:14 -0700 |
|---|---|---|
| committer | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2013-06-14 13:50:17 -0700 |
| commit | 92f8e76769c687a7c38c5067ff375c187666ac18 (patch) | |
| tree | 47b8efd7542d4e4c4dce5050317cd26fc0fa0602 /drivers/usb/host/xhci-mem.c | |
| parent | xhci: Remove BUG_ON() in xhci_alloc_container_ctx. (diff) | |
| download | linux-dev-92f8e76769c687a7c38c5067ff375c187666ac18.tar.xz linux-dev-92f8e76769c687a7c38c5067ff375c187666ac18.zip | |
xhci: Remove BUG_ON in xhci_get_input_control_ctx.
Fail gracefully, instead of causing the kernel to panic, if the input
control context doesn't have the right type (XHCI_CTX_TYPE_INPUT). Push
finding the pointer to the input control context up into functions that
can fail.
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: John Youn <johnyoun@synopsys.com>
Diffstat (limited to 'drivers/usb/host/xhci-mem.c')
| -rw-r--r-- | drivers/usb/host/xhci-mem.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index cc1b3efd5d76..b7487a10d7bc 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -389,7 +389,9 @@ static void xhci_free_container_ctx(struct xhci_hcd *xhci, struct xhci_input_control_ctx *xhci_get_input_control_ctx(struct xhci_hcd *xhci, struct xhci_container_ctx *ctx) { - BUG_ON(ctx->type != XHCI_CTX_TYPE_INPUT); + if (ctx->type != XHCI_CTX_TYPE_INPUT) + return NULL; + return (struct xhci_input_control_ctx *)ctx->bytes; } |