Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / input / touchscreen / sur40.c

diff --git a/drivers/input/touchscreen/sur40.c b/drivers/input/touchscreen/sur40.c
index 8be7b9b79f20b307059bab1f6825abef99dcd718..3f117637e832daf02abac291cae9e5701e5714e1 100644 (file)
--- a/drivers/input/touchscreen/sur40.c
+++ b/drivers/input/touchscreen/sur40.c
@@ -581,6 +581,7 @@ static int sur40_probe(struct usb_interface *interface,
        sur40->alloc_ctx = vb2_dma_sg_init_ctx(sur40->dev);
        if (IS_ERR(sur40->alloc_ctx)) {
                dev_err(sur40->dev, "Can't allocate buffer context");
+               error = PTR_ERR(sur40->alloc_ctx);
                goto err_unreg_v4l2;
        }