diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-29 08:25:19 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-29 08:25:19 +0200 |
commit | 6de465a50a900b29793aaba67f41f98f0e5354a0 (patch) | |
tree | f13eaeb75f0bfa3f7e609a58bcb891a869164042 /drivers/connector/connector.c | |
parent | 41db5f8397eee75afff82655a4884b5786a1d302 (diff) | |
parent | 609488bc979f99f805f34e9a32c1e3b71179d10b (diff) |
Merge 5.3-rc2 into char-misc-next
We want the char/misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/connector/connector.c')
-rw-r--r-- | drivers/connector/connector.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c index 23553ed6b548..2d22d6bf52f2 100644 --- a/drivers/connector/connector.c +++ b/drivers/connector/connector.c @@ -248,16 +248,12 @@ static int __maybe_unused cn_proc_show(struct seq_file *m, void *v) return 0; } -static struct cn_dev cdev = { - .input = cn_rx_skb, -}; - static int cn_init(void) { struct cn_dev *dev = &cdev; struct netlink_kernel_cfg cfg = { .groups = CN_NETLINK_USERS + 0xf, - .input = dev->input, + .input = cn_rx_skb, }; dev->nls = netlink_kernel_create(&init_net, NETLINK_CONNECTOR, &cfg); |