diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-05 08:51:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-05 08:51:37 +0200 |
| commit | b20e82939034a79e9af50853d63163fe21f205a9 (patch) | |
| tree | 7cfcf453c08e9b7e00530cfedc043eea23b0f367 /drivers/extcon | |
| parent | f7514a6630166a7b566dee9b1af2e87e431959be (diff) | |
| parent | e49d033bddf5b565044e2abe4241353959bc9120 (diff) | |
| download | linux-b20e82939034a79e9af50853d63163fe21f205a9.tar.gz linux-b20e82939034a79e9af50853d63163fe21f205a9.tar.bz2 linux-b20e82939034a79e9af50853d63163fe21f205a9.zip | |
Merge 5.12-rc6 into driver-core-next
We need the driver core fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/extcon')
| -rw-r--r-- | drivers/extcon/extcon.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/extcon/extcon.c b/drivers/extcon/extcon.c index 0a6438cbb3f3..e7a9561a826d 100644 --- a/drivers/extcon/extcon.c +++ b/drivers/extcon/extcon.c @@ -1241,6 +1241,7 @@ int extcon_dev_register(struct extcon_dev *edev) sizeof(*edev->nh), GFP_KERNEL); if (!edev->nh) { ret = -ENOMEM; + device_unregister(&edev->dev); goto err_dev; } |