diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org.(none)> | 2005-04-19 07:31:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org.(none)> | 2005-04-19 07:31:40 -0700 |
| commit | c79bea07ec4d3ef087962699fe8b2f6dc5ca7754 (patch) | |
| tree | 3fbdc4745cfde60df7d05815b343e4a253020530 /drivers/i2c/chips/via686a.c | |
| parent | a9e4820c4c170b3df0d2185f7b4130b0b2daed2c (diff) | |
| parent | 1d66c64c3cee10a465cd3f8bd9191bbeb718f650 (diff) | |
| download | kernel-crypto-c79bea07ec4d3ef087962699fe8b2f6dc5ca7754.tar.gz kernel-crypto-c79bea07ec4d3ef087962699fe8b2f6dc5ca7754.tar.xz kernel-crypto-c79bea07ec4d3ef087962699fe8b2f6dc5ca7754.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6.git/
Diffstat (limited to 'drivers/i2c/chips/via686a.c')
| -rw-r--r-- | drivers/i2c/chips/via686a.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/i2c/chips/via686a.c b/drivers/i2c/chips/via686a.c index 9b948f4531f..6614a59cecd 100644 --- a/drivers/i2c/chips/via686a.c +++ b/drivers/i2c/chips/via686a.c @@ -574,7 +574,7 @@ static ssize_t show_alarms(struct device *dev, char *buf) { struct via686a_data *data = via686a_update_device(dev); return sprintf(buf,"%d\n", ALARMS_FROM_REG(data->alarms)); } -static DEVICE_ATTR(alarms, S_IRUGO | S_IWUSR, show_alarms, NULL); +static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL); /* The driver. I choose to use type i2c_driver, as at is identical to both smbus_driver and isa_driver, and clients could be of either kind */ @@ -651,10 +651,9 @@ static int via686a_detect(struct i2c_adapter *adapter, int address, int kind) new_client->adapter = adapter; new_client->driver = &via686a_driver; new_client->flags = 0; - new_client->dev.parent = &adapter->dev; /* Fill in the remaining client fields and put into the global list */ - snprintf(new_client->name, I2C_NAME_SIZE, client_name); + strlcpy(new_client->name, client_name, I2C_NAME_SIZE); data->valid = 0; init_MUTEX(&data->update_lock); |