staging: Use GFP_ATOMIC when a lock is held

[net-next-2.6.git] / drivers / staging / vme / bridges / vme_tsi148.c

diff --git a/drivers/staging/vme/bridges/vme_tsi148.c b/drivers/staging/vme/bridges/vme_tsi148.c
index abe88a380b726894f82aae35158038e6a944d239..f09cac163139680a20eee6b9905c42ebce2b05f5 100644 (file)
--- a/drivers/staging/vme/bridges/vme_tsi148.c
+++ b/drivers/staging/vme/bridges/vme_tsi148.c
@@ -828,7 +828,7 @@ static int tsi148_alloc_resource(struct vme_master_resource *image,
                return 0;
 
        if (image->bus_resource.name == NULL) {
-               image->bus_resource.name = kmalloc(VMENAMSIZ+3, GFP_KERNEL);
+               image->bus_resource.name = kmalloc(VMENAMSIZ+3, GFP_ATOMIC);
                if (image->bus_resource.name == NULL) {
                        dev_err(tsi148_bridge->parent, "Unable to allocate "
                                "memory for resource name\n");