diff options
| author | David S. Miller <davem@davemloft.net> | 2012-06-29 00:37:00 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-29 00:37:00 (GMT) |
| commit | b26d344c6b87058ae3e8f919a18580abfc4204eb (patch) | |
| tree | ff7026df8e8715e3c63d0ff4ff697a9fac6323fb /drivers/extcon/extcon-max8997.c | |
| parent | 82aee5d7c01fd1a398e938e496e6cb8841775f91 (diff) | |
| parent | 76fbc247b9aebc30f6d2c8ec1f69edcb68eaa328 (diff) | |
| download | linux-b26d344c6b87058ae3e8f919a18580abfc4204eb.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/caif/caif_hsi.c
drivers/net/usb/qmi_wwan.c
The qmi_wwan merge was trivial.
The caif_hsi.c, on the other hand, was not. It's a conflict between
1c385f1fdf6f9c66d982802cd74349c040980b50 ("caif-hsi: Replace platform
device with ops structure.") in the net-next tree and commit
39abbaef19cd0a30be93794aa4773c779c3eb1f3 ("caif-hsi: Postpone init of
HIS until open()") in the net tree.
I did my best with that one and will ask Sjur to check it out.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/extcon/extcon-max8997.c')
| -rw-r--r-- | drivers/extcon/extcon-max8997.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c index 23416e4..a4ed30b 100644 --- a/drivers/extcon/extcon-max8997.c +++ b/drivers/extcon/extcon-max8997.c @@ -116,8 +116,8 @@ const char *max8997_extcon_cable[] = { [5] = "Charge-downstream", [6] = "MHL", [7] = "Dock-desk", - [7] = "Dock-card", - [8] = "JIG", + [8] = "Dock-card", + [9] = "JIG", NULL, }; @@ -514,6 +514,7 @@ static int __devexit max8997_muic_remove(struct platform_device *pdev) extcon_dev_unregister(info->edev); + kfree(info->edev); kfree(info); return 0; |