Merge branch 'master' into for-linus

This commit is contained in:
Rafael J. Wysocki 2009-08-17 20:42:36 +02:00
commit e6f25a7b23
1 changed files with 1 additions and 1 deletions

View File

@ -108,7 +108,7 @@ static int fill_pkg(struct cn_msg *msg, struct dm_ulog_request *tfr)
*(pkg->data_size) = 0;
} else if (tfr->data_size > *(pkg->data_size)) {
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));
*(pkg->data_size) = 0;