git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-3.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
ds.c
diff --git
a/arch/sparc/kernel/ds.c
b/arch/sparc/kernel/ds.c
index
7429b47
..
381edcd
100644
(file)
--- a/
arch/sparc/kernel/ds.c
+++ b/
arch/sparc/kernel/ds.c
@@
-1181,13
+1181,11
@@
static int __devinit ds_probe(struct vio_dev *vdev,
dp->rcv_buf_len = 4096;
dp->rcv_buf_len = 4096;
- dp->ds_states = k
zalloc(sizeof(ds_states_template)
,
- GFP_KERNEL);
+ dp->ds_states = k
memdup(ds_states_template
,
+
sizeof(ds_states_template),
GFP_KERNEL);
if (!dp->ds_states)
goto out_free_rcv_buf;
if (!dp->ds_states)
goto out_free_rcv_buf;
- memcpy(dp->ds_states, ds_states_template,
- sizeof(ds_states_template));
dp->num_ds_states = ARRAY_SIZE(ds_states_template);
for (i = 0; i < dp->num_ds_states; i++)
dp->num_ds_states = ARRAY_SIZE(ds_states_template);
for (i = 0; i < dp->num_ds_states; i++)