projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull video into release branch
[powerpc.git]
/
drivers
/
mfd
/
mcp-core.c
diff --git
a/drivers/mfd/mcp-core.c
b/drivers/mfd/mcp-core.c
index
75f401d
..
b4ed57e
100644
(file)
--- a/
drivers/mfd/mcp-core.c
+++ b/
drivers/mfd/mcp-core.c
@@
-200,9
+200,8
@@
struct mcp *mcp_host_alloc(struct device *parent, size_t size)
{
struct mcp *mcp;
{
struct mcp *mcp;
- mcp = k
m
alloc(sizeof(struct mcp) + size, GFP_KERNEL);
+ mcp = k
z
alloc(sizeof(struct mcp) + size, GFP_KERNEL);
if (mcp) {
if (mcp) {
- memset(mcp, 0, sizeof(struct mcp) + size);
spin_lock_init(&mcp->lock);
mcp->attached_device.parent = parent;
mcp->attached_device.bus = &mcp_bus_type;
spin_lock_init(&mcp->lock);
mcp->attached_device.parent = parent;
mcp->attached_device.bus = &mcp_bus_type;