diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-01-12 13:44:27 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-01-12 13:44:27 +0100 |
| commit | b8ae08db7a317c988b28c3ffc45d81af36e8ae40 (patch) | |
| tree | 8dc9cc223a967ced710dabe952e3a3f90823758e /drivers/extcon | |
| parent | 25e7eded884a5597d64b0f5c6d99706f1147019c (diff) | |
| parent | 7041ed0dde8319991b59003c414f0bda5192b041 (diff) | |
| download | linux-b8ae08db7a317c988b28c3ffc45d81af36e8ae40.tar.gz linux-b8ae08db7a317c988b28c3ffc45d81af36e8ae40.tar.bz2 linux-b8ae08db7a317c988b28c3ffc45d81af36e8ae40.zip | |
Merge tag 'extcon-next-for-6.14' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next
Pull extcon updates from Chanwoo:
Update extcon next for v6.14
Detailed description for this pull request:
- Fix null pointer check of memory allocation on extcon-rtk-type-c.c.
- Add EXTCON subsystem documentation including the detailed description/example.
- Drop unneeded init of struct i2c_device_id:driver_data on extcon-fsa9480/pth5150.c.
* tag 'extcon-next-for-6.14' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon:
extcon: Drop explicit initialization of struct i2c_device_id::driver_data to 0
Documentation: extcon: add documentation for Extcon subsystem
extcon: realtek: fix NULL deref check in extcon_rtk_type_c_probe
Diffstat (limited to 'drivers/extcon')
| -rw-r--r-- | drivers/extcon/extcon-fsa9480.c | 2 | ||||
| -rw-r--r-- | drivers/extcon/extcon-ptn5150.c | 2 | ||||
| -rw-r--r-- | drivers/extcon/extcon-rtk-type-c.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/drivers/extcon/extcon-fsa9480.c b/drivers/extcon/extcon-fsa9480.c index e458ce0c45ab..b11b43171063 100644 --- a/drivers/extcon/extcon-fsa9480.c +++ b/drivers/extcon/extcon-fsa9480.c @@ -350,7 +350,7 @@ static const struct dev_pm_ops fsa9480_pm_ops = { }; static const struct i2c_device_id fsa9480_id[] = { - { "fsa9480", 0 }, + { "fsa9480" }, {} }; MODULE_DEVICE_TABLE(i2c, fsa9480_id); diff --git a/drivers/extcon/extcon-ptn5150.c b/drivers/extcon/extcon-ptn5150.c index 4616da7e5430..78ad86c4a3be 100644 --- a/drivers/extcon/extcon-ptn5150.c +++ b/drivers/extcon/extcon-ptn5150.c @@ -338,7 +338,7 @@ static const struct of_device_id ptn5150_dt_match[] = { MODULE_DEVICE_TABLE(of, ptn5150_dt_match); static const struct i2c_device_id ptn5150_i2c_id[] = { - { "ptn5150", 0 }, + { "ptn5150" }, { } }; MODULE_DEVICE_TABLE(i2c, ptn5150_i2c_id); diff --git a/drivers/extcon/extcon-rtk-type-c.c b/drivers/extcon/extcon-rtk-type-c.c index bdc2b7b3a246..82b60b927e41 100644 --- a/drivers/extcon/extcon-rtk-type-c.c +++ b/drivers/extcon/extcon-rtk-type-c.c @@ -1369,6 +1369,8 @@ static int extcon_rtk_type_c_probe(struct platform_device *pdev) } type_c->type_c_cfg = devm_kzalloc(dev, sizeof(*type_c_cfg), GFP_KERNEL); + if (!type_c->type_c_cfg) + return -ENOMEM; memcpy(type_c->type_c_cfg, type_c_cfg, sizeof(*type_c_cfg)); |
