From c1f06d78f96a61e09597ff79b38460dc36c5bf78 Mon Sep 17 00:00:00 2001 From: Adrian McMenamin Date: Mon, 11 Feb 2008 00:25:02 +0000 Subject: [PATCH] --- yaml --- r: 85549 b: refs/heads/master c: b770d6b9b726932a74126311fa163ebf379631d8 h: refs/heads/master i: 85547: cd8d5403c2d3b270357660436ab84803addc0baf v: v3 --- [refs] | 2 +- trunk/drivers/sh/maple/maple.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 265e5a31fe44..e7d28d8cd270 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43081e18336d67937092dd05ffe320d2fbffd012 +refs/heads/master: b770d6b9b726932a74126311fa163ebf379631d8 diff --git a/trunk/drivers/sh/maple/maple.c b/trunk/drivers/sh/maple/maple.c index 616e2266e913..9cfcfd8dad5e 100644 --- a/trunk/drivers/sh/maple/maple.c +++ b/trunk/drivers/sh/maple/maple.c @@ -659,7 +659,6 @@ static int __init maple_bus_init(void) goto cleanup_device; retval = driver_register(&maple_dummy_driver.drv); - if (retval) goto cleanup_bus; @@ -705,7 +704,7 @@ static int __init maple_bus_init(void) mdev[i]->mq->length = 0; maple_add_packet(mdev[i]->mq); /* delay aids hardware detection */ - udelay(20); + mdelay(5); subdevice_map[i] = 0; }