diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-27 06:23:43 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-27 06:23:43 +0300 |
| commit | 786f949631c7d7dad6eae15659d29e78a5598662 (patch) | |
| tree | 4e11f5286705a88960fc2bb7a08d34550ed8fac0 | |
| parent | d8a60e000c951f845d9a5fb3e67853e0e63a5659 (diff) | |
| parent | 6594890020d505ddfab24a2dcd0b68b84628ed1e (diff) | |
| download | linux-786f949631c7d7dad6eae15659d29e78a5598662.tar.xz | |
Merge tag 'extcon-next-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next
Chanwoo writes:
Update extcon for v3.20
This patchset fix minor issue of extcon driver.
Detailed description for patchset:
- Remove duplicate header file in extcon-class.c and add 'const' keyword for
array in extcon-max77693.c.
- Release iio channel when executing *_remove() function in extcon-adc-jack.c
| -rw-r--r-- | drivers/extcon/extcon-adc-jack.c | 1 | ||||
| -rw-r--r-- | drivers/extcon/extcon-class.c | 1 | ||||
| -rw-r--r-- | drivers/extcon/extcon-max77693.c | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/drivers/extcon/extcon-adc-jack.c b/drivers/extcon/extcon-adc-jack.c index 5d7ab577fba9..2bb82e55065a 100644 --- a/drivers/extcon/extcon-adc-jack.c +++ b/drivers/extcon/extcon-adc-jack.c @@ -173,6 +173,7 @@ static int adc_jack_remove(struct platform_device *pdev) free_irq(data->irq, data); cancel_work_sync(&data->handler.work); + iio_channel_release(data->chan); return 0; } diff --git a/drivers/extcon/extcon-class.c b/drivers/extcon/extcon-class.c index 043dcd9946c9..8319f25b7145 100644 --- a/drivers/extcon/extcon-class.c +++ b/drivers/extcon/extcon-class.c @@ -32,7 +32,6 @@ #include <linux/of.h> #include <linux/slab.h> #include <linux/sysfs.h> -#include <linux/of.h> /* * extcon_cable_name suggests the standard cable names for commonly used diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c index 740a14d35072..af165fd0c6f5 100644 --- a/drivers/extcon/extcon-max77693.c +++ b/drivers/extcon/extcon-max77693.c @@ -1033,7 +1033,7 @@ static irqreturn_t max77693_muic_irq_handler(int irq, void *data) return IRQ_HANDLED; } -static struct regmap_config max77693_muic_regmap_config = { +static const struct regmap_config max77693_muic_regmap_config = { .reg_bits = 8, .val_bits = 8, }; |