From: Austin Yuan <[email protected]> in psb_drm.h we need to add error handeling data structures. This will allow developers handle errors correctly.
Change-Id: Idcbe6603a7357f5cec695480216ae857778d2f99 Signed-off-by: Austin Yuan <[email protected]> --- drivers/staging/mrst/drv/psb_drm.h | 4 +++- drivers/staging/mrst/imgv/psb_msvdx.c | 11 ----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/staging/mrst/drv/psb_drm.h b/drivers/staging/mrst/drv/psb_drm.h index eb48565..e74da68 100644 --- a/drivers/staging/mrst/drv/psb_drm.h +++ b/drivers/staging/mrst/drv/psb_drm.h @@ -280,7 +280,9 @@ typedef enum { LNC_VIDEO_GETPARAM_CI_INFO, LNC_VIDEO_GETPARAM_RAR_HANDLER_OFFSET, LNC_VIDEO_FRAME_SKIP, - LNC_VIDEO_CORE_NUM + IMG_VIDEO_DECODE_STATUS, + IMG_VIDEO_NEW_CONTEXT, + IMG_VIDEO_RM_CONTEXT } lnc_getparam_key_t; struct drm_lnc_video_getparam_arg { diff --git a/drivers/staging/mrst/imgv/psb_msvdx.c b/drivers/staging/mrst/imgv/psb_msvdx.c index fc4e506..bedbd5f 100644 --- a/drivers/staging/mrst/imgv/psb_msvdx.c +++ b/drivers/staging/mrst/imgv/psb_msvdx.c @@ -1047,17 +1047,6 @@ int lnc_video_getparam(struct drm_device *dev, void *data, ret = copy_to_user((void __user *) ((unsigned long)arg->value), &device_info, sizeof(device_info)); break; - case LNC_VIDEO_CORE_NUM: { - /* ret = pnw_video_get_core_num(dev, arg->value); */ - int n = 2; - if(IS_MRST(dev)) - ret = -EFAULT; - else if(IS_MDFLD(dev)) /* Medfield has two cores for encode */ - ret = copy_to_user((void __user *) ((unsigned long)arg->value), - &n, sizeof(unsigned long)); - } - break; - default: ret = -EFAULT; break; -- 1.7.1 _______________________________________________ MeeGo-kernel mailing list [email protected] http://lists.meego.com/listinfo/meego-kernel
