aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/joystick/db9.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-09-08 05:41:28 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-09-08 05:41:28 -0400
commit142e27fc8a3619471669d6241784eec9167c47d1 (patch)
treee88850b63ec910ee28874f93c43fb66421bb8119 /drivers/input/joystick/db9.c
parenta9053d0494d3c92807701c0f47df61d50c971581 (diff)
parentcaf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff)
downloadkernel_samsung_smdk4412-142e27fc8a3619471669d6241784eec9167c47d1.tar.gz
kernel_samsung_smdk4412-142e27fc8a3619471669d6241784eec9167c47d1.tar.bz2
kernel_samsung_smdk4412-142e27fc8a3619471669d6241784eec9167c47d1.zip
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/input/joystick/db9.c')
-rw-r--r--drivers/input/joystick/db9.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c
index fbd3eed07f9..2a3e4bb2da5 100644
--- a/drivers/input/joystick/db9.c
+++ b/drivers/input/joystick/db9.c
@@ -572,7 +572,7 @@ static struct db9 __init *db9_probe(int *config, int nargs)
}
}
- if (!(db9 = kcalloc(1, sizeof(struct db9), GFP_KERNEL))) {
+ if (!(db9 = kzalloc(sizeof(struct db9), GFP_KERNEL))) {
parport_put_port(pp);
return NULL;
}