mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 15:18:19 +00:00
7d72351a4e
The irq member was being set before calling the init function and then cs35l56_irq_request() was called only when the init was successful. However cs35l56_release() calls devm_free_irq() when the irq member is set and therefore if init() fails then this will cause an attempted free of an unallocated IRQ. Instead pass the desired IRQ number to the cs35l56_irq_request() function and set cs35l56->irq only when it has been successfully allocated. Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com> Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> Link: https://lore.kernel.org/r/168147949598.26.711670799488943454@mailman-core.alsa-project.org Signed-off-by: Mark Brown <broonie@kernel.org>
82 lines
2 KiB
C
82 lines
2 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
//
|
|
// CS35L56 ALSA SoC audio driver I2C binding
|
|
//
|
|
// Copyright (C) 2023 Cirrus Logic, Inc. and
|
|
// Cirrus Logic International Semiconductor Ltd.
|
|
|
|
#include <linux/acpi.h>
|
|
#include <linux/i2c.h>
|
|
#include <linux/module.h>
|
|
#include <linux/moduleparam.h>
|
|
#include <linux/regmap.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/types.h>
|
|
|
|
#include "cs35l56.h"
|
|
|
|
static int cs35l56_i2c_probe(struct i2c_client *client)
|
|
{
|
|
struct cs35l56_private *cs35l56;
|
|
struct device *dev = &client->dev;
|
|
const struct regmap_config *regmap_config = &cs35l56_regmap_i2c;
|
|
int ret;
|
|
|
|
cs35l56 = devm_kzalloc(dev, sizeof(struct cs35l56_private), GFP_KERNEL);
|
|
if (!cs35l56)
|
|
return -ENOMEM;
|
|
|
|
cs35l56->dev = dev;
|
|
cs35l56->can_hibernate = true;
|
|
|
|
i2c_set_clientdata(client, cs35l56);
|
|
cs35l56->regmap = devm_regmap_init_i2c(client, regmap_config);
|
|
if (IS_ERR(cs35l56->regmap)) {
|
|
ret = PTR_ERR(cs35l56->regmap);
|
|
return dev_err_probe(cs35l56->dev, ret, "Failed to allocate register map\n");
|
|
}
|
|
|
|
ret = cs35l56_common_probe(cs35l56);
|
|
if (ret != 0)
|
|
return ret;
|
|
|
|
ret = cs35l56_init(cs35l56);
|
|
if (ret == 0)
|
|
ret = cs35l56_irq_request(cs35l56, client->irq);
|
|
if (ret < 0)
|
|
cs35l56_remove(cs35l56);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static void cs35l56_i2c_remove(struct i2c_client *client)
|
|
{
|
|
struct cs35l56_private *cs35l56 = i2c_get_clientdata(client);
|
|
|
|
cs35l56_remove(cs35l56);
|
|
}
|
|
|
|
static const struct i2c_device_id cs35l56_id_i2c[] = {
|
|
{ "cs35l56", 0 },
|
|
{}
|
|
};
|
|
MODULE_DEVICE_TABLE(i2c, cs35l56_id_i2c);
|
|
|
|
static struct i2c_driver cs35l56_i2c_driver = {
|
|
.driver = {
|
|
.name = "cs35l56",
|
|
.pm = &cs35l56_pm_ops_i2c_spi,
|
|
},
|
|
.id_table = cs35l56_id_i2c,
|
|
.probe_new = cs35l56_i2c_probe,
|
|
.remove = cs35l56_i2c_remove,
|
|
};
|
|
|
|
module_i2c_driver(cs35l56_i2c_driver);
|
|
|
|
MODULE_DESCRIPTION("ASoC CS35L56 I2C driver");
|
|
MODULE_IMPORT_NS(SND_SOC_CS35L56_CORE);
|
|
MODULE_IMPORT_NS(SND_SOC_CS35L56_SHARED);
|
|
MODULE_AUTHOR("Richard Fitzgerald <rf@opensource.cirrus.com>");
|
|
MODULE_AUTHOR("Simon Trimmer <simont@opensource.cirrus.com>");
|
|
MODULE_LICENSE("GPL");
|