From 6319a21dbb7d7d1f635b140530fcade1cae514a6 Mon Sep 17 00:00:00 2001 From: Manohar Vanga Date: Fri, 4 Nov 2011 11:12:29 +0100 Subject: [PATCH] --- yaml --- r: 281059 b: refs/heads/master c: c26f6112990b90977db429596ed0640d153b3a32 h: refs/heads/master i: 281057: 6ac9803239840c0e5e7c3ae7c7319861282c61ba 281055: 7b8592d03da9beb53d71756d9eb687181eefabd1 v: v3 --- [refs] | 2 +- trunk/drivers/staging/vme/vme.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 95b02593a538..0034ae716d7d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3fe0a87f8fa98fb24ceb0231e326f3892e84e39b +refs/heads/master: c26f6112990b90977db429596ed0640d153b3a32 diff --git a/trunk/drivers/staging/vme/vme.c b/trunk/drivers/staging/vme/vme.c index b04b4688f705..3cbc69c65d78 100644 --- a/trunk/drivers/staging/vme/vme.c +++ b/trunk/drivers/staging/vme/vme.c @@ -1421,10 +1421,7 @@ static int __vme_register_driver(struct vme_driver *drv, unsigned int ndevs) * and if the bridge is removed, it will have to go through * vme_unregister_bridge() to do it (which calls remove() on * the bridge which in turn tries to acquire vme_buses_lock and - * will have to wait). The probe() called after device - * registration in __vme_register_driver below will also fail - * as the bridge is being removed (since the probe() calls - * vme_bridge_get()). + * will have to wait). */ err = __vme_register_driver_bus(drv, bridge, ndevs); if (err)