aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRicardo Salveti de Araujo <ricardo.salveti@canonical.com>2011-05-16 23:57:33 -0300
committerRicardo Salveti de Araujo <ricardo.salveti@canonical.com>2011-05-17 00:00:17 -0300
commit756ce3f5d976cf6bade51957aea289ddce4923d3 (patch)
tree26d9de1b6b33620e8da45026b44f4e9b15b80638 /drivers
parenta44b9cadc66053de09ce4db0040190cb0e9bf695 (diff)
downloadlinux-linaro-android-756ce3f5d976cf6bade51957aea289ddce4923d3.tar.gz
DRM: OMAP: replace request_module with request_module_nowait
Otherwise it'll hang while trying to identify the DRM cards and loading for the pvrsrvkm module. Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/omap/omap_gpu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/omap/omap_gpu.c b/drivers/gpu/drm/omap/omap_gpu.c
index 40fe9cbce9b..7a033eaeacd 100644
--- a/drivers/gpu/drm/omap/omap_gpu.c
+++ b/drivers/gpu/drm/omap/omap_gpu.c
@@ -458,7 +458,7 @@ static int dev_open(struct drm_device *dev, struct drm_file *file)
if (!found_pvr) {
DBG("open: PVR submodule not loaded.. let's try now");
- request_module(PVR_DRIVER_NAME);
+ request_module_nowait(PVR_DRIVER_NAME);
}
list_for_each_entry(plugin, &plugin_list, list) {