diff options
| author | David S. Miller <davem@davemloft.net> | 2015-10-20 16:08:27 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-20 16:08:27 +0300 |
| commit | 26440c835f8b1a491e2704118ac55bf87334366c (patch) | |
| tree | 3c2d23b59fd49b252fdbf6c09efc41b354933fc6 /drivers/input/serio/parkbd.c | |
| parent | 371f1c7e0d854796adc622cc3bacfcc5fc638db1 (diff) | |
| parent | 1099f86044111e9a7807f09523e42d4c9d0fb781 (diff) | |
| download | linux-26440c835f8b1a491e2704118ac55bf87334366c.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/usb/asix_common.c
net/ipv4/inet_connection_sock.c
net/switchdev/switchdev.c
In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.
The other two conflicts were overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/input/serio/parkbd.c')
| -rw-r--r-- | drivers/input/serio/parkbd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/serio/parkbd.c b/drivers/input/serio/parkbd.c index 26b45936f9fd..1e8cd6f1fe9e 100644 --- a/drivers/input/serio/parkbd.c +++ b/drivers/input/serio/parkbd.c @@ -194,6 +194,7 @@ static int __init parkbd_init(void) parkbd_port = parkbd_allocate_serio(); if (!parkbd_port) { parport_release(parkbd_dev); + parport_unregister_device(parkbd_dev); return -ENOMEM; } |