gpio fixes for v6.6-rc3
- fix an invalid usage of __free(kfree) leading to kfreeing an ERR_PTR() - fix an irq domain leak in gpio-tb10x - MAINTAINERS update -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEFp3rbAvDxGAT0sefEacuoBRx13IFAmUPMiMACgkQEacuoBRx 13KXsQ//UB5KdrlnHSBens2XuHBhPg121di5TDjC8Iae+88vIskfdp4kahq2w20g VYUS0DsmIkbH74d21uryzxdP/HRSOHx3G9h1fNtLMmF/YEeOhEhk2c5VlWYnV/Oe V0qiAsqBHdsK3fsX90IeW0qoglSJXGRl89kgm/Wpgs8yt/CHWvJ/tE/bzud58gvU lP8FipryfTjFRjn+K+tdqCVRq8qg0wlV9vQpLIjiEVyuRlYgPZdwG5srtvaP8hbE YjN82DKW1Cr6qD72JgD8ND1vHTb2uFznYLaqhF3x+7YvuY7c0JCoa1OBBcjnPFy5 EJTJN/UCV2eQAcDoPZzssvS+xTB//lIzo76VqLHog8D20Zm4JJh/jSY7NKNyHeH8 gkPnNddVP5GKbDsimPjdztE+ciO67uCkvAqROIWpCDY0ZAwMTc4p8xsng59a838k f2iQeO8g8GiX6z8VYEVyt4JkqLRgd7cAlqP9MdW+eXm7MTXh1h51YbBQGbIfhfde 5lPESJGV9BjQoITa7ur/bcS9zT56pTJztlYpmyqn5tF8S5jwffBsmdROad3AgBEI XriouPnYlPk9daSa5SQdY+uvoy8hFmH2b17/xZblJ6LBCiDew7kBmkiGMLW0DRPh TaY7YmXsXxRS5cX2cPdGAgT+u9yNPJtiY/BRJ/JzfmcBl/gURug= =KqzF -----END PGP SIGNATURE----- Merge tag 'gpio-fixes-for-v6.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux Pull gpio fixes from Bartosz Golaszewski: - fix an invalid usage of __free(kfree) leading to kfreeing an ERR_PTR() - fix an irq domain leak in gpio-tb10x - MAINTAINERS update * tag 'gpio-fixes-for-v6.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux: gpio: sim: fix an invalid __free() usage gpio: tb10x: Fix an error handling path in tb10x_gpio_probe() MAINTAINERS: gpio-regmap: make myself a maintainer of it
This commit is contained in:
Коммит
3aba70aed9
|
@ -8873,7 +8873,7 @@ F: drivers/gpio/gpio-mockup.c
|
|||
F: tools/testing/selftests/gpio/
|
||||
|
||||
GPIO REGMAP
|
||||
R: Michael Walle <michael@walle.cc>
|
||||
M: Michael Walle <michael@walle.cc>
|
||||
S: Maintained
|
||||
F: drivers/gpio/gpio-regmap.c
|
||||
F: include/linux/gpio/regmap.h
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
#include <linux/irq.h>
|
||||
#include <linux/irq_sim.h>
|
||||
#include <linux/list.h>
|
||||
#include <linux/minmax.h>
|
||||
#include <linux/mod_devicetable.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/mutex.h>
|
||||
|
@ -685,52 +686,32 @@ gpio_sim_device_config_live_show(struct config_item *item, char *page)
|
|||
return sprintf(page, "%c\n", live ? '1' : '0');
|
||||
}
|
||||
|
||||
static char **gpio_sim_make_line_names(struct gpio_sim_bank *bank,
|
||||
unsigned int *line_names_size)
|
||||
static unsigned int gpio_sim_get_line_names_size(struct gpio_sim_bank *bank)
|
||||
{
|
||||
unsigned int max_offset = 0;
|
||||
bool has_line_names = false;
|
||||
struct gpio_sim_line *line;
|
||||
char **line_names;
|
||||
unsigned int size = 0;
|
||||
|
||||
list_for_each_entry(line, &bank->line_list, siblings) {
|
||||
if (line->offset >= bank->num_lines)
|
||||
if (!line->name || (line->offset >= bank->num_lines))
|
||||
continue;
|
||||
|
||||
if (line->name) {
|
||||
if (line->offset > max_offset)
|
||||
max_offset = line->offset;
|
||||
|
||||
/*
|
||||
* max_offset can stay at 0 so it's not an indicator
|
||||
* of whether line names were configured at all.
|
||||
*/
|
||||
has_line_names = true;
|
||||
}
|
||||
size = max(size, line->offset + 1);
|
||||
}
|
||||
|
||||
if (!has_line_names)
|
||||
/*
|
||||
* This is not an error - NULL means, there are no line
|
||||
* names configured.
|
||||
*/
|
||||
return NULL;
|
||||
return size;
|
||||
}
|
||||
|
||||
*line_names_size = max_offset + 1;
|
||||
|
||||
line_names = kcalloc(*line_names_size, sizeof(*line_names), GFP_KERNEL);
|
||||
if (!line_names)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
static void
|
||||
gpio_sim_set_line_names(struct gpio_sim_bank *bank, char **line_names)
|
||||
{
|
||||
struct gpio_sim_line *line;
|
||||
|
||||
list_for_each_entry(line, &bank->line_list, siblings) {
|
||||
if (line->offset >= bank->num_lines)
|
||||
if (!line->name || (line->offset >= bank->num_lines))
|
||||
continue;
|
||||
|
||||
if (line->name && (line->offset <= max_offset))
|
||||
line_names[line->offset] = line->name;
|
||||
line_names[line->offset] = line->name;
|
||||
}
|
||||
|
||||
return line_names;
|
||||
}
|
||||
|
||||
static void gpio_sim_remove_hogs(struct gpio_sim_device *dev)
|
||||
|
@ -834,7 +815,7 @@ gpio_sim_make_bank_swnode(struct gpio_sim_bank *bank,
|
|||
struct fwnode_handle *parent)
|
||||
{
|
||||
struct property_entry properties[GPIO_SIM_PROP_MAX];
|
||||
unsigned int prop_idx = 0, line_names_size = 0;
|
||||
unsigned int prop_idx = 0, line_names_size;
|
||||
char **line_names __free(kfree) = NULL;
|
||||
|
||||
memset(properties, 0, sizeof(properties));
|
||||
|
@ -845,14 +826,19 @@ gpio_sim_make_bank_swnode(struct gpio_sim_bank *bank,
|
|||
properties[prop_idx++] = PROPERTY_ENTRY_STRING("gpio-sim,label",
|
||||
bank->label);
|
||||
|
||||
line_names = gpio_sim_make_line_names(bank, &line_names_size);
|
||||
if (IS_ERR(line_names))
|
||||
return ERR_CAST(line_names);
|
||||
line_names_size = gpio_sim_get_line_names_size(bank);
|
||||
if (line_names_size) {
|
||||
line_names = kcalloc(line_names_size, sizeof(*line_names),
|
||||
GFP_KERNEL);
|
||||
if (!line_names)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
gpio_sim_set_line_names(bank, line_names);
|
||||
|
||||
if (line_names)
|
||||
properties[prop_idx++] = PROPERTY_ENTRY_STRING_ARRAY_LEN(
|
||||
"gpio-line-names",
|
||||
line_names, line_names_size);
|
||||
}
|
||||
|
||||
return fwnode_create_software_node(properties, parent);
|
||||
}
|
||||
|
|
|
@ -195,7 +195,7 @@ static int tb10x_gpio_probe(struct platform_device *pdev)
|
|||
handle_edge_irq, IRQ_NOREQUEST, IRQ_NOPROBE,
|
||||
IRQ_GC_INIT_MASK_CACHE);
|
||||
if (ret)
|
||||
return ret;
|
||||
goto err_remove_domain;
|
||||
|
||||
gc = tb10x_gpio->domain->gc->gc[0];
|
||||
gc->reg_base = tb10x_gpio->base;
|
||||
|
@ -209,6 +209,10 @@ static int tb10x_gpio_probe(struct platform_device *pdev)
|
|||
}
|
||||
|
||||
return 0;
|
||||
|
||||
err_remove_domain:
|
||||
irq_domain_remove(tb10x_gpio->domain);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int tb10x_gpio_remove(struct platform_device *pdev)
|
||||
|
|
Загрузка…
Ссылка в новой задаче