git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
char
/
mbcs.c
diff --git
a/drivers/char/mbcs.c
b/drivers/char/mbcs.c
index
ac9cfa9
..
c268ee0
100644
(file)
--- a/
drivers/char/mbcs.c
+++ b/
drivers/char/mbcs.c
@@
-699,7
+699,7
@@
static inline int mbcs_hw_init(struct mbcs_soft *soft)
return 0;
}
return 0;
}
-static ssize_t show_algo(struct device *dev, char *buf)
+static ssize_t show_algo(struct device *dev,
struct device_attribute *attr,
char *buf)
{
struct cx_dev *cx_dev = to_cx_dev(dev);
struct mbcs_soft *soft = cx_dev->soft;
{
struct cx_dev *cx_dev = to_cx_dev(dev);
struct mbcs_soft *soft = cx_dev->soft;
@@
-715,7
+715,7
@@
static ssize_t show_algo(struct device *dev, char *buf)
(debug0 >> 32), (debug0 & 0xffffffff));
}
(debug0 >> 32), (debug0 & 0xffffffff));
}
-static ssize_t store_algo(struct device *dev, const char *buf, size_t count)
+static ssize_t store_algo(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count)
{
int n;
struct cx_dev *cx_dev = to_cx_dev(dev);
{
int n;
struct cx_dev *cx_dev = to_cx_dev(dev);
@@
-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) {