projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.10.107' into update
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
drivers
/
gpu
/
drm
/
vmwgfx
/
vmwgfx_ioctl.c
diff --git
a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
index c509d40c4897ad9e1bdf8fd37d6618c9ccb44be0..17a503ff260f94ede3c8a52b947ad3a4961a2395 100644
(file)
--- a/
drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
+++ b/
drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
@@
-69,8
+69,6
@@
int vmw_getparam_ioctl(struct drm_device *dev, void *data,
break;
}
default:
break;
}
default:
- DRM_ERROR("Illegal vmwgfx get param request: %d\n",
- param->param);
return -EINVAL;
}
return -EINVAL;
}
@@
-90,7
+88,7
@@
int vmw_get_cap_3d_ioctl(struct drm_device *dev, void *data,
void *bounce;
int ret;
void *bounce;
int ret;
- if (unlikely(arg->pad64 != 0)) {
+ if (unlikely(arg->pad64 != 0
|| arg->max_size == 0
)) {
DRM_ERROR("Illegal GET_3D_CAP argument.\n");
return -EINVAL;
}
DRM_ERROR("Illegal GET_3D_CAP argument.\n");
return -EINVAL;
}