Changeset 260 for GPL/branches/alsa-resync1/alsa-kernel/isa/cmi8330.c

Timestamp:

Oct 15, 2007, 1:51:34 AM (18 years ago)

Author:

Brendan Oakley

Message:

Merged to ALSA 0.9.6

File:

• GPL/branches/alsa-resync1/alsa-kernel/isa/cmi8330.c (modified) (1 diff)

GPL/branches/alsa-resync1/alsa-kernel/isa/cmi8330.c

@@ -298 +298 @@
 {
         struct pnp_dev *pdev;
-        struct pnp_resource_table * cfg = kmalloc(GFP_ATOMIC, sizeof(struct pnp_resource_table));
+        struct pnp_resource_table * cfg = kmalloc(sizeof(struct pnp_resource_table), GFP_KERNEL);
         int err;