From ced66f0e05abb01a25dce54319a5eb5650646fc0 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Thu, 9 Apr 2009 10:35:47 +0800 Subject: [PATCH] --- yaml --- r: 142887 b: refs/heads/master c: 97c18e2c7a8e36d2d83d50ee070314aadac73a11 h: refs/heads/master i: 142885: 6fe29f2a8e4fdf982d3b793cc622a42f37c52b94 142883: ac1b6a74d929f6d3c442f0f310ef121f85d864e6 142879: 69b6ee4d4283bf075a7744b9e71da998d8eab5f9 v: v3 --- [refs] | 2 +- trunk/include/linux/kmod.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bcb88520401e..27b31027f379 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4efdd65b754ebbf41484d3a2255c59282720650 +refs/heads/master: 97c18e2c7a8e36d2d83d50ee070314aadac73a11 diff --git a/trunk/include/linux/kmod.h b/trunk/include/linux/kmod.h index d5fa565086d1..384ca8bbf1ac 100644 --- a/trunk/include/linux/kmod.h +++ b/trunk/include/linux/kmod.h @@ -34,7 +34,7 @@ extern int __request_module(bool wait, const char *name, ...) \ #define request_module(mod...) __request_module(true, mod) #define request_module_nowait(mod...) __request_module(false, mod) #define try_then_request_module(x, mod...) \ - ((x) ?: (__request_module(false, mod), (x))) + ((x) ?: (__request_module(true, mod), (x))) #else static inline int request_module(const char *name, ...) { return -ENOSYS; } static inline int request_module_nowait(const char *name, ...) { return -ENOSYS; }