diff --git a/[refs] b/[refs] index 6b12c5a01063..39f154144b83 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b375de0b09ef1659c28f365a9a8e947c311f77e5 +refs/heads/master: 4ef7fe7c66d4653930f67566a1df1c8f2d6daa6b diff --git a/trunk/drivers/gpu/drm/drm_drv.c b/trunk/drivers/gpu/drm/drm_drv.c index 8a9d0792e4ec..946bd91c57ec 100644 --- a/trunk/drivers/gpu/drm/drm_drv.c +++ b/trunk/drivers/gpu/drm/drm_drv.c @@ -486,7 +486,7 @@ long drm_ioctl(struct file *filp, kfree(kdata); atomic_dec(&dev->ioctl_count); if (retcode) - DRM_DEBUG("ret = %x\n", retcode); + DRM_DEBUG("ret = %d\n", retcode); return retcode; }