Commit b242954b authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'spi/fix/mpc512x' into spi-linus

parents 78e9fa52 eadf69cf
...@@ -522,8 +522,10 @@ static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr, ...@@ -522,8 +522,10 @@ static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr,
psc_num = master->bus_num; psc_num = master->bus_num;
snprintf(clk_name, sizeof(clk_name), "psc%d_mclk", psc_num); snprintf(clk_name, sizeof(clk_name), "psc%d_mclk", psc_num);
clk = devm_clk_get(dev, clk_name); clk = devm_clk_get(dev, clk_name);
if (IS_ERR(clk)) if (IS_ERR(clk)) {
ret = PTR_ERR(clk);
goto free_irq; goto free_irq;
}
ret = clk_prepare_enable(clk); ret = clk_prepare_enable(clk);
if (ret) if (ret)
goto free_irq; goto free_irq;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment