Merge "msm: vidc: Correct debugfs directory name"

This commit is contained in:
Linux Build Service Account 2016-11-02 05:22:33 -07:00 committed by Gerrit - the friendly Code Review server
commit 8992f7dd08

View file

@ -157,7 +157,7 @@ struct dentry *msm_vidc_debugfs_init_drv(void)
struct dentry *f = debugfs_create_##__type(__name, S_IRUGO | S_IWUSR, \ struct dentry *f = debugfs_create_##__type(__name, S_IRUGO | S_IWUSR, \
dir, __value); \ dir, __value); \
if (IS_ERR_OR_NULL(f)) { \ if (IS_ERR_OR_NULL(f)) { \
dprintk(VIDC_ERR, "Failed creating debugfs file '%pKd/%s'\n", \ dprintk(VIDC_ERR, "Failed creating debugfs file '%pd/%s'\n", \
dir, __name); \ dir, __name); \
f = NULL; \ f = NULL; \
} \ } \
@ -349,7 +349,7 @@ struct dentry *msm_vidc_debugfs_init_inst(struct msm_vidc_inst *inst,
dprintk(VIDC_ERR, "Invalid params, inst: %pK\n", inst); dprintk(VIDC_ERR, "Invalid params, inst: %pK\n", inst);
goto failed_create_dir; goto failed_create_dir;
} }
snprintf(debugfs_name, MAX_DEBUGFS_NAME, "inst_%pK", inst); snprintf(debugfs_name, MAX_DEBUGFS_NAME, "inst_%p", inst);
dir = debugfs_create_dir(debugfs_name, parent); dir = debugfs_create_dir(debugfs_name, parent);
if (!dir) { if (!dir) {
dprintk(VIDC_ERR, "Failed to create debugfs for msm_vidc\n"); dprintk(VIDC_ERR, "Failed to create debugfs for msm_vidc\n");