lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge linux-2.6 with linux-acpi-2.6

Browse Source
This commit is contained in:
Len Brown
2005-09-08 01:45:47 -04:00
parent 4a35a46bf1 caf39e87cc
commit 64e47488c9
1968 changed files with 58374 additions and 48994 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/pnp/pnpacpi/rsparser.c
View File

@@ -255,7 +255,7 @@ static void pnpacpi_parse_dma_option(struct pnp_option *option, struct acpi_reso
if (p->number_of_channels == 0)
return;
dma = pnpacpi_kmalloc(sizeof(struct pnp_dma), GFP_KERNEL);
dma = kcalloc(1, sizeof(struct pnp_dma), GFP_KERNEL);
if (!dma)
return;
@@ -311,7 +311,7 @@ static void pnpacpi_parse_irq_option(struct pnp_option *option,
if (p->number_of_interrupts == 0)
return;
irq = pnpacpi_kmalloc(sizeof(struct pnp_irq), GFP_KERNEL);
irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL);
if (!irq)
return;
@@ -332,7 +332,7 @@ static void pnpacpi_parse_ext_irq_option(struct pnp_option *option,
if (p->number_of_interrupts == 0)
return;
irq = pnpacpi_kmalloc(sizeof(struct pnp_irq), GFP_KERNEL);
irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL);
if (!irq)
return;
@@ -353,7 +353,7 @@ pnpacpi_parse_port_option(struct pnp_option *option,
if (io->range_length == 0)
return;
port = pnpacpi_kmalloc(sizeof(struct pnp_port), GFP_KERNEL);
port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
if (!port)
return;
port->min = io->min_base_address;
@@ -374,7 +374,7 @@ pnpacpi_parse_fixed_port_option(struct pnp_option *option,
if (io->range_length == 0)
return;
port = pnpacpi_kmalloc(sizeof(struct pnp_port), GFP_KERNEL);
port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
if (!port)
return;
port->min = port->max = io->base_address;
@@ -393,7 +393,7 @@ pnpacpi_parse_mem24_option(struct pnp_option *option,
if (p->range_length == 0)
return;
mem = pnpacpi_kmalloc(sizeof(struct pnp_mem), GFP_KERNEL);
mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
if (!mem)
return;
mem->min = p->min_base_address;
@@ -416,7 +416,7 @@ pnpacpi_parse_mem32_option(struct pnp_option *option,
if (p->range_length == 0)
return;
mem = pnpacpi_kmalloc(sizeof(struct pnp_mem), GFP_KERNEL);
mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
if (!mem)
return;
mem->min = p->min_base_address;
@@ -439,7 +439,7 @@ pnpacpi_parse_fixed_mem32_option(struct pnp_option *option,
if (p->range_length == 0)
return;
mem = pnpacpi_kmalloc(sizeof(struct pnp_mem), GFP_KERNEL);
mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
if (!mem)
return;
mem->min = mem->max = p->range_base_address;
@@ -623,7 +623,7 @@ int pnpacpi_build_resource_template(acpi_handle handle,
if (!res_cnt)
return -EINVAL;
buffer->length = sizeof(struct acpi_resource) * (res_cnt + 1) + 1;
buffer->pointer = pnpacpi_kmalloc(buffer->length - 1, GFP_KERNEL);
buffer->pointer = kcalloc(1, buffer->length - 1, GFP_KERNEL);
if (!buffer->pointer)
return -ENOMEM;
pnp_dbg("Res cnt %d", res_cnt);