diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-10-22 14:19:57 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-10-22 14:19:57 +0400 |
| commit | 930352862e9533fecc42c7ed20798a7c9e3aa874 (patch) | |
| tree | f234d6eb69c077f898e375aef30c9550dcf069d7 /net/netlabel/netlabel_user.c | |
| parent | b46882b6eb713245916100ac5b58664cd242a08d (diff) | |
| parent | 7bbd03e0143b562ff7d96f7e71c016104020b550 (diff) | |
| download | linux-930352862e9533fecc42c7ed20798a7c9e3aa874.tar.xz | |
Merge branch 'topic/enum-info-cleanup' into for-next
this is a series of patches to just convert the plain info callback
for enum ctl elements to snd_ctl_elem_info(). Also, it includes the
extension of snd_ctl_elem_info(), for catching the unexpected string
cut-off and handling the zero items.
Diffstat (limited to 'net/netlabel/netlabel_user.c')
| -rw-r--r-- | net/netlabel/netlabel_user.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/netlabel/netlabel_user.c b/net/netlabel/netlabel_user.c index 1e779bb7fa43..adf8b7900da2 100644 --- a/net/netlabel/netlabel_user.c +++ b/net/netlabel/netlabel_user.c @@ -71,11 +71,7 @@ int __init netlbl_netlink_init(void) if (ret_val != 0) return ret_val; - ret_val = netlbl_unlabel_genl_init(); - if (ret_val != 0) - return ret_val; - - return 0; + return netlbl_unlabel_genl_init(); } /* |