commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=8284839e13a9d205a8e6d80be336101683640714 branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/trunk
Signed-off-by: Scott Jiang <[email protected]> --- drivers/spi/spi-bfin6xx.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-bfin6xx.c b/drivers/spi/spi-bfin6xx.c index 6c9bae3..480bc82 100644 --- a/drivers/spi/spi-bfin6xx.c +++ b/drivers/spi/spi-bfin6xx.c @@ -728,8 +728,9 @@ static void bfin_spi_cleanup(struct spi_device *spi) peripheral_free(ssel[spi->master->bus_num] [chip->cs-1]); bfin_spi_cs_disable(drv_data, chip); - } else + } else { gpio_free(chip->cs_gpio); + } kfree(chip); spi_set_ctldata(spi, NULL); @@ -849,7 +850,6 @@ static int bfin_spi_probe(struct platform_device *pdev) drv_data->regs = devm_ioremap_resource(dev, mem); if (IS_ERR(drv_data->regs)) { - dev_err(dev, "can not map register memory\n"); ret = PTR_ERR(drv_data->regs); goto err_put_master; } @@ -962,8 +962,7 @@ static int bfin_spi_resume(struct device *dev) return ret; } static const struct dev_pm_ops bfin_spi_pm_ops = { - .suspend = bfin_spi_suspend, - .resume = bfin_spi_resume, + SET_SYSTEM_SLEEP_PM_OPS(bfin_spi_suspend, bfin_spi_resume) }; #endif /* CONFIG_PM */
_______________________________________________ Linux-kernel-commits mailing list [email protected] https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
