Commit 003ecadd authored by David S. Miller's avatar David S. Miller

Merge tag 'linux-can-fixes-for-4.10-20170118' of...

Merge tag 'linux-can-fixes-for-4.10-20170118' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can

Marc Kleine-Budde says:

====================
pull-request: can 2017-01-18

this is a pull request for net/master consisting of two patches.

In the first patch Einar Jón fixes a NULL-pointer-deref in the c_can_pci
driver. In the second patch Yegor Yefremov fixes the clock handling in the
ti_hecc driver.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 93b43fd1 befa6011
...@@ -161,6 +161,7 @@ static int c_can_pci_probe(struct pci_dev *pdev, ...@@ -161,6 +161,7 @@ static int c_can_pci_probe(struct pci_dev *pdev,
dev->irq = pdev->irq; dev->irq = pdev->irq;
priv->base = addr; priv->base = addr;
priv->device = &pdev->dev;
if (!c_can_pci_data->freq) { if (!c_can_pci_data->freq) {
dev_err(&pdev->dev, "no clock frequency defined\n"); dev_err(&pdev->dev, "no clock frequency defined\n");
......
...@@ -948,7 +948,12 @@ static int ti_hecc_probe(struct platform_device *pdev) ...@@ -948,7 +948,12 @@ static int ti_hecc_probe(struct platform_device *pdev)
netif_napi_add(ndev, &priv->napi, ti_hecc_rx_poll, netif_napi_add(ndev, &priv->napi, ti_hecc_rx_poll,
HECC_DEF_NAPI_WEIGHT); HECC_DEF_NAPI_WEIGHT);
clk_enable(priv->clk); err = clk_prepare_enable(priv->clk);
if (err) {
dev_err(&pdev->dev, "clk_prepare_enable() failed\n");
goto probe_exit_clk;
}
err = register_candev(ndev); err = register_candev(ndev);
if (err) { if (err) {
dev_err(&pdev->dev, "register_candev() failed\n"); dev_err(&pdev->dev, "register_candev() failed\n");
...@@ -981,7 +986,7 @@ static int ti_hecc_remove(struct platform_device *pdev) ...@@ -981,7 +986,7 @@ static int ti_hecc_remove(struct platform_device *pdev)
struct ti_hecc_priv *priv = netdev_priv(ndev); struct ti_hecc_priv *priv = netdev_priv(ndev);
unregister_candev(ndev); unregister_candev(ndev);
clk_disable(priv->clk); clk_disable_unprepare(priv->clk);
clk_put(priv->clk); clk_put(priv->clk);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
iounmap(priv->base); iounmap(priv->base);
...@@ -1006,7 +1011,7 @@ static int ti_hecc_suspend(struct platform_device *pdev, pm_message_t state) ...@@ -1006,7 +1011,7 @@ static int ti_hecc_suspend(struct platform_device *pdev, pm_message_t state)
hecc_set_bit(priv, HECC_CANMC, HECC_CANMC_PDR); hecc_set_bit(priv, HECC_CANMC, HECC_CANMC_PDR);
priv->can.state = CAN_STATE_SLEEPING; priv->can.state = CAN_STATE_SLEEPING;
clk_disable(priv->clk); clk_disable_unprepare(priv->clk);
return 0; return 0;
} }
...@@ -1015,8 +1020,11 @@ static int ti_hecc_resume(struct platform_device *pdev) ...@@ -1015,8 +1020,11 @@ static int ti_hecc_resume(struct platform_device *pdev)
{ {
struct net_device *dev = platform_get_drvdata(pdev); struct net_device *dev = platform_get_drvdata(pdev);
struct ti_hecc_priv *priv = netdev_priv(dev); struct ti_hecc_priv *priv = netdev_priv(dev);
int err;
clk_enable(priv->clk); err = clk_prepare_enable(priv->clk);
if (err)
return err;
hecc_clear_bit(priv, HECC_CANMC, HECC_CANMC_PDR); hecc_clear_bit(priv, HECC_CANMC, HECC_CANMC_PDR);
priv->can.state = CAN_STATE_ERROR_ACTIVE; priv->can.state = CAN_STATE_ERROR_ACTIVE;
......
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