git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
irda
/
irtty-sir.c
diff --git
a/drivers/net/irda/irtty-sir.c
b/drivers/net/irda/irtty-sir.c
index ad1857364d51c42ff3a23ce610fc8083ac059754..6f5f697ec9f891ef557c2d4c35342a987d6978b7 100644
(file)
--- a/
drivers/net/irda/irtty-sir.c
+++ b/
drivers/net/irda/irtty-sir.c
@@
-505,10
+505,9
@@
static int irtty_open(struct tty_struct *tty)
}
/* allocate private device info block */
- priv = k
m
alloc(sizeof(*priv), GFP_KERNEL);
+ priv = k
z
alloc(sizeof(*priv), GFP_KERNEL);
if (!priv)
goto out_put;
- memset(priv, 0, sizeof(*priv));
priv->magic = IRTTY_MAGIC;
priv->tty = tty;