Merge tag 'linux-can-fixes-for-4.10-20170118' of... (003ecadd) · Commits · 戴 / test

drivers/net/can/c_can/c_can_pci.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -161,6 +161,7 @@ static int c_can_pci_probe(struct pci_dev *pdev,

		dev->irq = pdev->irq;
		priv->base = addr;
		priv->device = &pdev->dev;

		if (!c_can_pci_data->freq) {
		dev_err(&pdev->dev, "no clock frequency defined\n");

+12 −4

Original line number	Diff line number	Diff line
		@@ -948,7 +948,12 @@ static int ti_hecc_probe(struct platform_device *pdev)
		netif_napi_add(ndev, &priv->napi, ti_hecc_rx_poll,
		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);
		if (err) {
		dev_err(&pdev->dev, "register_candev() failed\n");
		@@ -981,7 +986,7 @@ static int ti_hecc_remove(struct platform_device *pdev)
		struct ti_hecc_priv *priv = netdev_priv(ndev);

		unregister_candev(ndev);
		clk_disable(priv->clk);
		clk_disable_unprepare(priv->clk);
		clk_put(priv->clk);
		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		iounmap(priv->base);
		@@ -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);
		priv->can.state = CAN_STATE_SLEEPING;

		clk_disable(priv->clk);
		clk_disable_unprepare(priv->clk);

		return 0;
		}
		@@ -1015,8 +1020,11 @@ static int ti_hecc_resume(struct platform_device *pdev)
		{
		struct net_device *dev = platform_get_drvdata(pdev);
		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);
		priv->can.state = CAN_STATE_ERROR_ACTIVE;