Merge branch 'akpm' (updates from Andrew Morton)

[~andy/linux] / drivers / spi / spi.c

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 32b7bb111eb6b53d9e96808f7bd5fd0982cffd9d..978dda2c523982f62c676573feb1955da0ca82da 100644 (file)
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -223,7 +223,7 @@ static const struct dev_pm_ops spi_pm = {
        SET_RUNTIME_PM_OPS(
                pm_generic_runtime_suspend,
                pm_generic_runtime_resume,
-               pm_generic_runtime_idle
+               NULL
        )
 };
 
@@ -601,7 +601,7 @@ static int spi_init_queue(struct spi_master *master)
 
        init_kthread_worker(&master->kworker);
        master->kworker_task = kthread_run(kthread_worker_fn,
-                                          &master->kworker,
+                                          &master->kworker, "%s",
                                           dev_name(&master->dev));
        if (IS_ERR(master->kworker_task)) {
                dev_err(&master->dev, "failed to create message pump task\n");