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 'master' into upstream
[pandora-kernel.git]
/
drivers
/
serial
/
serial_cs.c
diff --git
a/drivers/serial/serial_cs.c
b/drivers/serial/serial_cs.c
index
431433f
..
c2f1012
100644
(file)
--- a/
drivers/serial/serial_cs.c
+++ b/
drivers/serial/serial_cs.c
@@
-35,7
+35,6
@@
#include <linux/moduleparam.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/moduleparam.h>
#include <linux/kernel.h>
#include <linux/init.h>
-#include <linux/sched.h>
#include <linux/ptrace.h>
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/ptrace.h>
#include <linux/slab.h>
#include <linux/string.h>
@@
-334,10
+333,9
@@
static int serial_probe(struct pcmcia_device *link)
DEBUG(0, "serial_attach()\n");
/* Create new serial device */
DEBUG(0, "serial_attach()\n");
/* Create new serial device */
- info = k
m
alloc(sizeof (*info), GFP_KERNEL);
+ info = k
z
alloc(sizeof (*info), GFP_KERNEL);
if (!info)
return -ENOMEM;
if (!info)
return -ENOMEM;
- memset(info, 0, sizeof (*info));
info->p_dev = link;
link->priv = info;
info->p_dev = link;
link->priv = info;