diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-27 06:44:10 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-27 06:44:10 -0800 |
commit | 962b686c450493adb8596e813bdfd0e1613482e6 (patch) | |
tree | ae836829fd0fd6141aea657537e42b8e94564c38 /drivers/extcon/extcon-class.c | |
parent | 70e78c40ed6c25bb34d642848e485d79ffc55c26 (diff) | |
parent | df072eb97dcfb819390227649f6b7c07a90aa2df (diff) |
Merge tag 'pull_req_20121122' of git://git.kernel.org/pub/scm/linux/kernel/git/mzx/extcon into char-misc-next
MyungJoo writes:
"extcon pull request targetting Linux 3.8 for Greg KH on 2012.11.22
This is based on Linux 3.7 rc6"
Diffstat (limited to 'drivers/extcon/extcon-class.c')
-rw-r--r-- | drivers/extcon/extcon-class.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/extcon/extcon-class.c b/drivers/extcon/extcon-class.c index d398821097f3..60adc04b0561 100644 --- a/drivers/extcon/extcon-class.c +++ b/drivers/extcon/extcon-class.c @@ -472,7 +472,7 @@ int extcon_register_interest(struct extcon_specific_cable_nb *obj, obj->cable_index = extcon_find_cable_index(obj->edev, cable_name); if (obj->cable_index < 0) - return -ENODEV; + return obj->cable_index; obj->user_nb = nb; |