projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
[powerpc.git]
/
drivers
/
char
/
mbcs.c
diff --git
a/drivers/char/mbcs.c
b/drivers/char/mbcs.c
index
115dbb3
..
c268ee0
100644
(file)
--- a/
drivers/char/mbcs.c
+++ b/
drivers/char/mbcs.c
@@
-750,7
+750,7
@@
static int mbcs_probe(struct cx_dev *dev, const struct cx_device_id *id)
dev->soft = NULL;
dev->soft = NULL;
- soft = k
calloc(1,
sizeof(struct mbcs_soft), GFP_KERNEL);
+ soft = k
zalloc(
sizeof(struct mbcs_soft), GFP_KERNEL);
if (soft == NULL)
return -ENOMEM;
if (soft == NULL)
return -ENOMEM;
@@
-830,6
+830,9
@@
static int __init mbcs_init(void)
{
int rv;
{
int rv;
+ if (!ia64_platform_is("sn2"))
+ return -ENODEV;
+
// Put driver into chrdevs[]. Get major number.
rv = register_chrdev(mbcs_major, DEVICE_NAME, &mbcs_ops);
if (rv < 0) {
// Put driver into chrdevs[]. Get major number.
rv = register_chrdev(mbcs_major, DEVICE_NAME, &mbcs_ops);
if (rv < 0) {