From 8bf41aa47d080abf4835ebec004b0bc7d01e24f7 Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 5 Jan 2006 14:36:47 +0000 Subject: [PATCH] --- yaml --- r: 18383 b: refs/heads/master c: 2f53a80fc0f6287d4bd6cc2422cd095c90f30410 h: refs/heads/master i: 18381: a39f613a7e85f5cdc907a1daa26dfac9ed51939c 18379: 55531ce67cee6f422c27edac15e109f2dfc31dbe 18375: 5d198f6130aecedccdcac5a8f6d7a4fbda6b8b06 18367: 14394039b1e61bea6a5a4f78c3968967c4986ae1 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/vio.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f70fe7c0ebfb..579ca509479c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79f9fb8886d901fd549793a4ad632ece51c68405 +refs/heads/master: 2f53a80fc0f6287d4bd6cc2422cd095c90f30410 diff --git a/trunk/arch/powerpc/kernel/vio.c b/trunk/arch/powerpc/kernel/vio.c index 13c41495fe06..13c655ba2841 100644 --- a/trunk/arch/powerpc/kernel/vio.c +++ b/trunk/arch/powerpc/kernel/vio.c @@ -76,7 +76,7 @@ static void vio_bus_shutdown(struct device *dev) struct vio_dev *viodev = to_vio_dev(dev); struct vio_driver *viodrv = to_vio_driver(dev->driver); - if (viodrv->shutdown) + if (dev->driver && viodrv->shutdown) viodrv->shutdown(viodev); } @@ -91,9 +91,6 @@ int vio_register_driver(struct vio_driver *viodrv) /* fill in 'struct driver' fields */ viodrv->driver.bus = &vio_bus_type; - viodrv->driver.probe = vio_bus_probe; - viodrv->driver.remove = vio_bus_remove; - viodrv->driver.shutdown = vio_bus_shutdown; return driver_register(&viodrv->driver); } @@ -295,4 +292,7 @@ struct bus_type vio_bus_type = { .name = "vio", .uevent = vio_hotplug, .match = vio_bus_match, + .probe = vio_bus_probe, + .remove = vio_bus_remove, + .shutdown = vio_bus_shutdown, };