const void *out;
        unsigned int len;
        unsigned int actual_len;
+       struct i3c_priv_xfer *xfer;
        bool continued;
 };
 
 
        if (readl(master->regs + SVC_I3C_MERRWARN) & SVC_I3C_MERRWARN_NACK) {
                ret = -ENXIO;
+               *actual_len = 0;
                goto emit_stop;
        }
 
         */
        if (SVC_I3C_MSTATUS_IBIWON(reg)) {
                ret = -ENXIO;
+               *actual_len = 0;
                goto emit_stop;
        }
 
                                          cmd->addr, cmd->in, cmd->out,
                                          cmd->len, &cmd->actual_len,
                                          cmd->continued);
+               /* cmd->xfer is NULL if I2C or CCC transfer */
+               if (cmd->xfer)
+                       cmd->xfer->actual_len = cmd->actual_len;
+
                if (ret)
                        break;
        }
        for (i = 0; i < nxfers; i++) {
                struct svc_i3c_cmd *cmd = &xfer->cmds[i];
 
+               cmd->xfer = &xfers[i];
                cmd->addr = master->addrs[data->index];
                cmd->rnw = xfers[i].rnw;
                cmd->in = xfers[i].rnw ? xfers[i].data.in : NULL;