The patch titled wireless/iwlwifi/: fix debugfs_create_bool()'s error checking has been added to the -mm tree. Its filename is wireless-iwlwifi-fix-debugfs_create_bools-error-checking.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: wireless/iwlwifi/: fix debugfs_create_bool()'s error checking From: Zhao Lei <zhaolei@xxxxxxxxxxxxxx> debugfs_create_bool() returns NULL if an error occurs, returns -ENODEV when debugfs is not enabled in the kernel. Signed-off-by: Zhao Lei <zhaolei@xxxxxxxxxxxxxx> Cc: Tomas Winkler <tomas.winkler@xxxxxxxxx> Cc: John W. Linville <linville@xxxxxxxxxxxxx> Cc: Reinette Chatre <reinette.chatre@xxxxxxxxx> Cc: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx> Cc: Zhu Yi <yi.zhu@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/net/wireless/iwlwifi/iwl-debugfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN drivers/net/wireless/iwlwifi/iwl-debugfs.c~wireless-iwlwifi-fix-debugfs_create_bools-error-checking drivers/net/wireless/iwlwifi/iwl-debugfs.c --- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c~wireless-iwlwifi-fix-debugfs_create_bools-error-checking +++ a/drivers/net/wireless/iwlwifi/iwl-debugfs.c @@ -58,7 +58,8 @@ #define DEBUGFS_ADD_BOOL(name, parent, ptr) do { \ dbgfs->dbgfs_##parent##_files.file_##name = \ debugfs_create_bool(#name, 0644, dbgfs->dir_##parent, ptr); \ - if (IS_ERR(dbgfs->dbgfs_##parent##_files.file_##name)) \ + if (IS_ERR(dbgfs->dbgfs_##parent##_files.file_##name) \ + || !dbgfs->dbgfs_##parent##_files.file_##name) \ goto err; \ } while (0) _ Patches currently in -mm which might be from zhaolei@xxxxxxxxxxxxxx are origin.patch linux-next.patch wireless-iwlwifi-fix-debugfs_create_bools-error-checking.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html