aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi_butterfly.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/spi/spi_butterfly.c')
-rw-r--r--drivers/spi/spi_butterfly.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi_butterfly.c b/drivers/spi/spi_butterfly.c
index 312987a03210..31b7970ae463 100644
--- a/drivers/spi/spi_butterfly.c
+++ b/drivers/spi/spi_butterfly.c
@@ -246,7 +246,7 @@ static void butterfly_attach(struct parport *p)
246 * and no way to be selective about what it binds to. 246 * and no way to be selective about what it binds to.
247 */ 247 */
248 248
249 /* FIXME where should master->cdev.dev come from? 249 /* FIXME where should master->dev.parent come from?
250 * e.g. /sys/bus/pnp0/00:0b, some PCI thing, etc 250 * e.g. /sys/bus/pnp0/00:0b, some PCI thing, etc
251 * setting up a platform device like this is an ugly kluge... 251 * setting up a platform device like this is an ugly kluge...
252 */ 252 */
@@ -386,7 +386,7 @@ static void butterfly_detach(struct parport *p)
386 butterfly = NULL; 386 butterfly = NULL;
387 387
388 /* stop() unregisters child devices too */ 388 /* stop() unregisters child devices too */
389 pdev = to_platform_device(pp->bitbang.master->cdev.dev); 389 pdev = to_platform_device(pp->bitbang.master->dev.parent);
390 status = spi_bitbang_stop(&pp->bitbang); 390 status = spi_bitbang_stop(&pp->bitbang);
391 391
392 /* turn off VCC */ 392 /* turn off VCC */