Commit e6f25a7b authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

Merge branch 'master' into for-linus

parents 3e2bcad8 894ef820
...@@ -108,7 +108,7 @@ static int fill_pkg(struct cn_msg *msg, struct dm_ulog_request *tfr) ...@@ -108,7 +108,7 @@ static int fill_pkg(struct cn_msg *msg, struct dm_ulog_request *tfr)
*(pkg->data_size) = 0; *(pkg->data_size) = 0;
} else if (tfr->data_size > *(pkg->data_size)) { } else if (tfr->data_size > *(pkg->data_size)) {
DMERR("Insufficient space to receive package [%u] " DMERR("Insufficient space to receive package [%u] "
"(%u vs %lu)", tfr->request_type, "(%u vs %zu)", tfr->request_type,
tfr->data_size, *(pkg->data_size)); tfr->data_size, *(pkg->data_size));
*(pkg->data_size) = 0; *(pkg->data_size) = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment