diff options
| author |   Stephen Boyd <stephen.boyd@linaro.org> | 2016-06-23 19:34:30 +0900 |
|---|---|---|
| committer |   Chanwoo Choi <cw00.choi@samsung.com> | 2016-06-23 19:35:10 +0900 |
| commit | a05f44c89ee1151b0da3ddd43d9e57d8f15b2f20 (patch) | |
| tree | da73c58dfbbd8e873c86a939f506fd93640c014c /drivers/extcon | |
| parent | Merge branch 'ib-extcon-powersupply-4.8' into extcon-next (diff) | |
| download | linux-dev-a05f44c89ee1151b0da3ddd43d9e57d8f15b2f20.tar.xz linux-dev-a05f44c89ee1151b0da3ddd43d9e57d8f15b2f20.zip | |
extcon: Check for incorrect connection type in notifier register
If we call extcon_register_notifier() with the wrong cable type,
it blows up with an oops instead of returning an error code.
Let's be nice and fail gracefully given that the consumer might
not know if the cable is supported by the extcon provider.
Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Diffstat (limited to 'drivers/extcon')
| -rw-r--r-- | drivers/extcon/extcon.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/extcon/extcon.c b/drivers/extcon/extcon.c index 4fef9ab4b148..b6408f015637 100644 --- a/drivers/extcon/extcon.c +++ b/drivers/extcon/extcon.c @@ -415,6 +415,8 @@ int extcon_register_notifier(struct extcon_dev *edev, unsigned int id, if (edev) { idx = find_cable_index_by_id(edev, id); + if (idx < 0) + return idx; spin_lock_irqsave(&edev->lock, flags); ret = raw_notifier_chain_register(&edev->nh[idx], nb); @@ -458,6 +460,8 @@ int extcon_unregister_notifier(struct extcon_dev *edev, unsigned int id, return -EINVAL; idx = find_cable_index_by_id(edev, id); + if (idx < 0) + return idx; spin_lock_irqsave(&edev->lock, flags); ret = raw_notifier_chain_unregister(&edev->nh[idx], nb); |