diff --git a/[refs] b/[refs] index c26d8f05808a..a250e1b012e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94f5659cfa4f14ba901fbbb8a57d0145754d0d37 +refs/heads/master: d49d0e39a09209d0136c7da2a1a52e99af2d4656 diff --git a/trunk/drivers/staging/otus/wrap_usb.c b/trunk/drivers/staging/otus/wrap_usb.c index 93459cadc472..9f04047bf5a6 100644 --- a/trunk/drivers/staging/otus/wrap_usb.c +++ b/trunk/drivers/staging/otus/wrap_usb.c @@ -104,6 +104,11 @@ u32_t zfwUsbSubmitControl(zdev_t *dev, u8_t req, u16_t value, u16_t index, if (size > 0) { buf = kmalloc(size, GFP_KERNEL); + if (buf == NULL) { + pr_err("zfwUsbSubmitControl() failed, " + "kmalloc() returned NULL\n"); + return 1; + } memcpy(buf, (u8_t *)data, size); } else buf = NULL;