Merge remote-tracking branches 'asoc/topic/rl6231', 'asoc/topic/rockchip', 'asoc...

[firefly-linux-kernel-4.4.55.git] / drivers / misc / sgi-gru / grukdump.c

diff --git a/drivers/misc/sgi-gru/grukdump.c b/drivers/misc/sgi-gru/grukdump.c
index 2bef3f76032aa117d8bc2fa06451e832118acce1..a3700a56b8ff677d4b972de099ef6cde5b49ea9a 100644 (file)
--- a/drivers/misc/sgi-gru/grukdump.c
+++ b/drivers/misc/sgi-gru/grukdump.c
@@ -178,10 +178,10 @@ static int gru_dump_context(struct gru_state *gru, int ctxnum,
        hdr.cbrcnt = cbrcnt;
        hdr.dsrcnt = dsrcnt;
        hdr.cch_locked = cch_locked;
-       if (!ret && copy_to_user((void __user *)uhdr, &hdr, sizeof(hdr)))
-               ret = -EFAULT;
+       if (copy_to_user(uhdr, &hdr, sizeof(hdr)))
+               return -EFAULT;
 
-       return ret ? ret : bytes;
+       return bytes;
 }
 
 int gru_dump_chiplet_request(unsigned long arg)