Revert "nl80211: fix cherry-pick conflict"

This reverts commit 57e66aad0b28fdea34c4362fcc8e6508a39e84c7.
Revert "ASoC: core: fix possible ZERO_SIZE_PTR pointer dereferencing error and fix cherry-pick conflict"

This reverts commit e9c93265c875cb6602ca9bd83d59d483040b6ce7.