diff --git a/[refs] b/[refs] index ecab4c1154c4..56d88d5d5d34 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c5e51dae2c37127e00be392f40842e08077e96a +refs/heads/master: 6d54aaf389bb47f30fd6567b88665689967be642 diff --git a/trunk/drivers/video/metronomefb.c b/trunk/drivers/video/metronomefb.c index afeed0611e3e..df1f757a6161 100644 --- a/trunk/drivers/video/metronomefb.c +++ b/trunk/drivers/video/metronomefb.c @@ -188,7 +188,7 @@ static int __devinit load_waveform(u8 *mem, size_t size, int m, int t, epd_frame_table[par->dt].wfm_size = user_wfm_size; if (size != epd_frame_table[par->dt].wfm_size) { - dev_err(dev, "Error: unexpected size %d != %d\n", size, + dev_err(dev, "Error: unexpected size %Zd != %d\n", size, epd_frame_table[par->dt].wfm_size); return -EINVAL; }