git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
pnp
/
pnpacpi
/
core.c
diff --git
a/drivers/pnp/pnpacpi/core.c
b/drivers/pnp/pnpacpi/core.c
index
f104577
..
62eda5d
100644
(file)
--- a/
drivers/pnp/pnpacpi/core.c
+++ b/
drivers/pnp/pnpacpi/core.c
@@
-19,7
+19,6
@@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <linux/config.h>
#include <linux/acpi.h>
#include <linux/pnp.h>
#include <acpi/acpi_bus.h>
#include <linux/acpi.h>
#include <linux/pnp.h>
#include <acpi/acpi_bus.h>
@@
-140,7
+139,7
@@
static int __init pnpacpi_add_device(struct acpi_device *device)
return 0;
pnp_dbg("ACPI device : hid %s", acpi_device_hid(device));
return 0;
pnp_dbg("ACPI device : hid %s", acpi_device_hid(device));
- dev = k
calloc(1,
sizeof(struct pnp_dev), GFP_KERNEL);
+ dev = k
zalloc(
sizeof(struct pnp_dev), GFP_KERNEL);
if (!dev) {
pnp_err("Out of memory");
return -ENOMEM;
if (!dev) {
pnp_err("Out of memory");
return -ENOMEM;
@@
-170,7
+169,7
@@
static int __init pnpacpi_add_device(struct acpi_device *device)
dev->number = num;
/* set the initial values for the PnP device */
dev->number = num;
/* set the initial values for the PnP device */
- dev_id = k
calloc(1,
sizeof(struct pnp_id), GFP_KERNEL);
+ dev_id = k
zalloc(
sizeof(struct pnp_id), GFP_KERNEL);
if (!dev_id)
goto err;
pnpidacpi_to_pnpid(acpi_device_hid(device), dev_id->id);
if (!dev_id)
goto err;
pnpidacpi_to_pnpid(acpi_device_hid(device), dev_id->id);
@@
-202,7
+201,7
@@
static int __init pnpacpi_add_device(struct acpi_device *device)
for (i = 0; i < cid_list->count; i++) {
if (!ispnpidacpi(cid_list->id[i].value))
continue;
for (i = 0; i < cid_list->count; i++) {
if (!ispnpidacpi(cid_list->id[i].value))
continue;
- dev_id = k
calloc(1,
sizeof(struct pnp_id), GFP_KERNEL);
+ dev_id = k
zalloc(
sizeof(struct pnp_id), GFP_KERNEL);
if (!dev_id)
continue;
if (!dev_id)
continue;