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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
char
/
snsc.c
diff --git
a/drivers/char/snsc.c
b/drivers/char/snsc.c
index
07e0b75
..
d22da98
100644
(file)
--- a/
drivers/char/snsc.c
+++ b/
drivers/char/snsc.c
@@
-5,7
+5,7
@@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (C) 2004
, 2006
Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 2004 Silicon Graphics, Inc. All rights reserved.
*/
/*
*/
/*
@@
-77,7
+77,7
@@
scdrv_open(struct inode *inode, struct file *file)
scd = container_of(inode->i_cdev, struct sysctl_data_s, scd_cdev);
/* allocate memory for subchannel data */
scd = container_of(inode->i_cdev, struct sysctl_data_s, scd_cdev);
/* allocate memory for subchannel data */
- sd = k
z
alloc(sizeof (struct subch_data_s), GFP_KERNEL);
+ sd = k
m
alloc(sizeof (struct subch_data_s), GFP_KERNEL);
if (sd == NULL) {
printk("%s: couldn't allocate subchannel data\n",
__FUNCTION__);
if (sd == NULL) {
printk("%s: couldn't allocate subchannel data\n",
__FUNCTION__);
@@
-85,6
+85,7
@@
scdrv_open(struct inode *inode, struct file *file)
}
/* initialize subch_data_s fields */
}
/* initialize subch_data_s fields */
+ memset(sd, 0, sizeof (struct subch_data_s));
sd->sd_nasid = scd->scd_nasid;
sd->sd_subch = ia64_sn_irtr_open(scd->scd_nasid);
sd->sd_nasid = scd->scd_nasid;
sd->sd_subch = ia64_sn_irtr_open(scd->scd_nasid);
@@
-105,7
+106,7
@@
scdrv_open(struct inode *inode, struct file *file)
/* hook this subchannel up to the system controller interrupt */
rv = request_irq(SGI_UART_VECTOR, scdrv_interrupt,
/* hook this subchannel up to the system controller interrupt */
rv = request_irq(SGI_UART_VECTOR, scdrv_interrupt,
-
IRQF_SHARED | IRQF_DISABLED
,
+
SA_SHIRQ | SA_INTERRUPT
,
SYSCTL_BASENAME, sd);
if (rv) {
ia64_sn_irtr_close(sd->sd_nasid, sd->sd_subch);
SYSCTL_BASENAME, sd);
if (rv) {
ia64_sn_irtr_close(sd->sd_nasid, sd->sd_subch);
@@
-347,7
+348,7
@@
scdrv_poll(struct file *file, struct poll_table_struct *wait)
return mask;
}
return mask;
}
-static
const
struct file_operations scdrv_fops = {
+static struct file_operations scdrv_fops = {
.owner = THIS_MODULE,
.read = scdrv_read,
.write = scdrv_write,
.owner = THIS_MODULE,
.read = scdrv_read,
.write = scdrv_write,
@@
-374,12
+375,7
@@
scdrv_init(void)
struct sysctl_data_s *scd;
void *salbuf;
dev_t first_dev, dev;
struct sysctl_data_s *scd;
void *salbuf;
dev_t first_dev, dev;
- nasid_t event_nasid;
-
- if (!ia64_platform_is("sn2"))
- return -ENODEV;
-
- event_nasid = ia64_sn_get_console_nasid();
+ nasid_t event_nasid = ia64_sn_get_console_nasid();
if (alloc_chrdev_region(&first_dev, 0, num_cnodes,
SYSCTL_BASENAME) < 0) {
if (alloc_chrdev_region(&first_dev, 0, num_cnodes,
SYSCTL_BASENAME) < 0) {
@@
-399,7
+395,7
@@
scdrv_init(void)
geo_slab(geoid));
/* allocate sysctl device data */
geo_slab(geoid));
/* allocate sysctl device data */
- scd = k
z
alloc(sizeof (struct sysctl_data_s),
+ scd = k
m
alloc(sizeof (struct sysctl_data_s),
GFP_KERNEL);
if (!scd) {
printk("%s: failed to allocate device info"
GFP_KERNEL);
if (!scd) {
printk("%s: failed to allocate device info"
@@
-407,6
+403,7
@@
scdrv_init(void)
SYSCTL_BASENAME, devname);
continue;
}
SYSCTL_BASENAME, devname);
continue;
}
+ memset(scd, 0, sizeof (struct sysctl_data_s));
/* initialize sysctl device data fields */
scd->scd_nasid = cnodeid_to_nasid(cnode);
/* initialize sysctl device data fields */
scd->scd_nasid = cnodeid_to_nasid(cnode);