diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-05-21 22:26:14 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-05-21 22:26:14 +0200 |
| commit | 8b79f2ce80d62e92d11ca90e472f240305e14f1f (patch) | |
| tree | 6bd44d41195d141a5982222de38d30469e9a9062 | |
| parent | 8a452c2c17bc284e3f91b8ed4aec9d2b9b342df7 (diff) | |
| parent | bdc5f06789c5a0c3a9a2c0eb33ec4d177dbdaa22 (diff) | |
| download | u-boot-imx-8b79f2ce80d62e92d11ca90e472f240305e14f1f.zip u-boot-imx-8b79f2ce80d62e92d11ca90e472f240305e14f1f.tar.gz u-boot-imx-8b79f2ce80d62e92d11ca90e472f240305e14f1f.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-ubi
| -rw-r--r-- | drivers/mtd/ubi/wl.c | 9 | ||||
| -rw-r--r-- | include/ubi_uboot.h | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c index 2f9a5e3..88b867a 100644 --- a/drivers/mtd/ubi/wl.c +++ b/drivers/mtd/ubi/wl.c @@ -696,8 +696,13 @@ static void schedule_ubi_work(struct ubi_device *ubi, struct ubi_work *wrk) list_add_tail(&wrk->list, &ubi->works); ubi_assert(ubi->works_count >= 0); ubi->works_count += 1; - if (ubi->thread_enabled) - wake_up_process(ubi->bgt_thread); + + /* + * U-Boot special: We have no bgt_thread in U-Boot! + * So just call do_work() here directly. + */ + do_work(ubi); + spin_unlock(&ubi->wl_lock); } diff --git a/include/ubi_uboot.h b/include/ubi_uboot.h index 60f6a5f..d2c90a6 100644 --- a/include/ubi_uboot.h +++ b/include/ubi_uboot.h @@ -123,7 +123,7 @@ typedef int wait_queue_head_t; #define init_rwsem(...) do { } while (0) #define down_read(...) do { } while (0) #define down_write(...) do { } while (0) -#define down_write_trylock(...) 0 +#define down_write_trylock(...) 1 #define up_read(...) do { } while (0) #define up_write(...) do { } while (0) |