diff options
| author | Len Brown <len.brown@intel.com> | 2006-12-16 01:04:27 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-12-16 01:04:27 -0500 |
| commit | cece901481bafbf14de8cbd3a89ae869ea881055 (patch) | |
| tree | f9e240443643008c8feeaf55919105dc63ab8c72 /drivers/acpi/pci_bind.c | |
| parent | cfee47f99bc14a6d7c6b0be2284db2cef310a815 (diff) | |
| parent | 50dd096973f1d95aa03c6a6d9e148d706b62b68e (diff) | |
Pull style into test branch
Conflicts:
drivers/acpi/button.c
drivers/acpi/ec.c
drivers/acpi/osl.c
drivers/acpi/sbs.c
Diffstat (limited to 'drivers/acpi/pci_bind.c')
| -rw-r--r-- | drivers/acpi/pci_bind.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/pci_bind.c b/drivers/acpi/pci_bind.c index 1e2ae6e7a7e4..70b440f3f262 100644 --- a/drivers/acpi/pci_bind.c +++ b/drivers/acpi/pci_bind.c | |||
| @@ -281,7 +281,7 @@ int acpi_pci_unbind(struct acpi_device *device) | |||
| 281 | if (!device || !device->parent) | 281 | if (!device || !device->parent) |
| 282 | return -EINVAL; | 282 | return -EINVAL; |
| 283 | 283 | ||
| 284 | pathname = (char *)kmalloc(ACPI_PATHNAME_MAX, GFP_KERNEL); | 284 | pathname = kmalloc(ACPI_PATHNAME_MAX, GFP_KERNEL); |
| 285 | if (!pathname) | 285 | if (!pathname) |
| 286 | return -ENOMEM; | 286 | return -ENOMEM; |
| 287 | memset(pathname, 0, ACPI_PATHNAME_MAX); | 287 | memset(pathname, 0, ACPI_PATHNAME_MAX); |
| @@ -332,7 +332,7 @@ acpi_pci_bind_root(struct acpi_device *device, | |||
| 332 | struct acpi_buffer buffer = { 0, NULL }; | 332 | struct acpi_buffer buffer = { 0, NULL }; |
| 333 | 333 | ||
| 334 | 334 | ||
| 335 | pathname = (char *)kmalloc(ACPI_PATHNAME_MAX, GFP_KERNEL); | 335 | pathname = kmalloc(ACPI_PATHNAME_MAX, GFP_KERNEL); |
| 336 | if (!pathname) | 336 | if (!pathname) |
| 337 | return -ENOMEM; | 337 | return -ENOMEM; |
| 338 | memset(pathname, 0, ACPI_PATHNAME_MAX); | 338 | memset(pathname, 0, ACPI_PATHNAME_MAX); |