mirror of
https://github.com/torvalds/linux.git
synced 2026-11-07 06:17:02 +01:00
Update peci-next for v7.4-rc1
Small fixes in controller drivers including: - fix for uninitialized clk_init_data structure (peci-aspeed), - moving lock and completion initializations before registering interrupt handler to avoid using them uninitialized (peci-aspeed, peci-npcm). -----BEGIN PGP SIGNATURE----- iQJOBAABCgA4FiEEVeIYQcCloMPRsCC93RgStozwYHYFAmq23VMaHGl3b25hLndp bmlhcnNrYUBpbnRlbC5jb20ACgkQ3RgStozwYHa9sxAAgQ2O7zGZfvB64lWEM72A 1/sVeJNqnzMHNqBKUjmwvJT1TFub6S282AbhXCyURtcm3ht036n1ZcTCmWSULDRO 7ba8dTjCYbShMrSN+09s6Haapl48xd+c+v2JFsqOFYxvrHFuC5/47E8BnsT0Cpkn GTChJ4UvAMcuN9TVsUS7afvJp58WbF+m9+yuCddCEhEM2fs1u5LO01R09xrpIm29 8Kw0GKHXqOeGQHYtyzG3rLE8lvfIAhAKA4yWtP8mgFpex7yIPJll1QZ2ZaaR7YDc NvvwyxSzbdbSXzTqrUFmiTb/9RgTELUhQEF3dfcjzp+BDEBSzH+lR0sv3L4XelzL sD5Dz8o9Y5ERAaK8YrarLr4meu1BsbAApx6B8gH3p5royQ4hlZdQcDwi2WD5auvx oHgMr/bud6VMLbYkGRVzxlz0Z+RbE9epcbqU4V7Xf2pgYUXB/CIMZFUwK/wBN5ui 1uav4FIczx3r8GP71ckGaZl7iMoKk1DI+NwOeQjXMe2UwirV82KBxlPOVUu4enkS k9InUWPP+f4bViVvAsC7Sw0pHBvtSzzqpecgWGxhdAcvCzoVD0DU9uPoc2Ta36GL ICCDe4RbH7sWiVCY+GV0n0HVluCInxgBnfYWXfieveba+K2jso+XtXo5t6orA+HH Y8xqCHE0o7W7dM9/ichIau8= =8l5+ -----END PGP SIGNATURE----- Merge tag 'peci-next-7.4-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/iwi/linux into char-misc-next Iwona writes: Update peci-next for v7.4-rc1 Small fixes in controller drivers including: - fix for uninitialized clk_init_data structure (peci-aspeed), - moving lock and completion initializations before registering interrupt handler to avoid using them uninitialized (peci-aspeed, peci-npcm). * tag 'peci-next-7.4-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/iwi/linux: peci: npcm: Initialize state before requesting IRQ peci: aspeed: Initialize state before requesting IRQ peci: controller: aspeed: Make sure clk_init_data is fully initialized
This commit is contained in:
commit
6f80fd798b
|
|
@ -413,7 +413,7 @@ static struct clk *devm_aspeed_peci_register_clk_div(struct device *dev, struct
|
|||
struct aspeed_peci *priv)
|
||||
{
|
||||
struct clk_aspeed_peci *peci_clk;
|
||||
struct clk_init_data init;
|
||||
struct clk_init_data init = {};
|
||||
const char *parent_name;
|
||||
char name[32];
|
||||
int ret;
|
||||
|
|
@ -529,14 +529,14 @@ static int aspeed_peci_probe(struct platform_device *pdev)
|
|||
if (priv->irq < 0)
|
||||
return priv->irq;
|
||||
|
||||
init_completion(&priv->xfer_complete);
|
||||
spin_lock_init(&priv->lock);
|
||||
|
||||
ret = devm_request_irq(&pdev->dev, priv->irq, aspeed_peci_irq_handler,
|
||||
0, "peci-aspeed", priv);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
init_completion(&priv->xfer_complete);
|
||||
spin_lock_init(&priv->lock);
|
||||
|
||||
priv->rst = devm_reset_control_get(&pdev->dev, NULL);
|
||||
if (IS_ERR(priv->rst))
|
||||
return dev_err_probe(priv->dev, PTR_ERR(priv->rst),
|
||||
|
|
|
|||
|
|
@ -253,14 +253,14 @@ static int npcm_peci_probe(struct platform_device *pdev)
|
|||
if (priv->irq < 0)
|
||||
return priv->irq;
|
||||
|
||||
init_completion(&priv->xfer_complete);
|
||||
spin_lock_init(&priv->lock);
|
||||
|
||||
ret = devm_request_irq(&pdev->dev, priv->irq, npcm_peci_irq_handler,
|
||||
0, "peci-npcm-irq", priv);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
init_completion(&priv->xfer_complete);
|
||||
spin_lock_init(&priv->lock);
|
||||
|
||||
ret = npcm_peci_init_ctrl(priv);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user