Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6] / drivers / spi / spi_txx9.c

diff --git a/drivers/spi/spi_txx9.c b/drivers/spi/spi_txx9.c
index b7f4bb239eaf79e74dfede155474c43aac272795..cc5094f37dd3d71a791df96efa58c374d8d68137 100644 (file)
--- a/drivers/spi/spi_txx9.c
+++ b/drivers/spi/spi_txx9.c
@@ -400,7 +400,7 @@ static int __init txx9spi_probe(struct platform_device *dev)
                goto exit;
        }
 
-       c->workqueue = create_singlethread_workqueue(master->cdev.dev->bus_id);
+       c->workqueue = create_singlethread_workqueue(master->dev.parent->bus_id);
        if (!c->workqueue)
                goto exit;
        c->last_chipselect = -1;