Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / staging / vme / bridges / vme_ca91cx42.c

diff --git a/drivers/staging/vme/bridges/vme_ca91cx42.c b/drivers/staging/vme/bridges/vme_ca91cx42.c
index 0c82eb47a28dd706d554788533252231b3f6fe82..0f9ea58ff71705bb10823b83158ad99ae996c1d9 100644 (file)
--- a/drivers/staging/vme/bridges/vme_ca91cx42.c
+++ b/drivers/staging/vme/bridges/vme_ca91cx42.c
@@ -523,7 +523,7 @@ static int ca91cx42_alloc_resource(struct vme_master_resource *image,
        }
 
        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(ca91cx42_bridge->parent, "Unable to allocate "
                                "memory for resource name\n");