BackMerge v4.19-rc5 into drm-next

Sean Paul requested an -rc5 backmerge from some sun4i fixes.

Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/misc/ibmvmc.c b/drivers/misc/ibmvmc.c
index 8f82bb9d11e2..b8aaa684c397 100644
--- a/drivers/misc/ibmvmc.c
+++ b/drivers/misc/ibmvmc.c
@@ -2131,7 +2131,7 @@ static int ibmvmc_init_crq_queue(struct crq_server_adapter *adapter)
         retrc = plpar_hcall_norets(H_REG_CRQ,
                                    vdev->unit_address,
                                    queue->msg_token, PAGE_SIZE);
-        retrc = rc;
+        rc = retrc;
 
         if (rc == H_RESOURCE)
                 rc = ibmvmc_reset_crq_queue(adapter);