diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2010-01-08 09:26:34 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2010-01-08 09:26:34 +0100 |
| commit | 1cb4f624ea38361b6397966470f0a1bed5532483 (patch) | |
| tree | 418b05ddc854b09d64f7d5ee0c78875e42b5f151 /drivers/pcmcia/socket_sysfs.c | |
| parent | 444c1953d496d272208902ff7010dc70d1f887f0 (diff) | |
| parent | 2c1f1895ef2aa8f0e5497893eff71304aef332e1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into fixes
Diffstat (limited to 'drivers/pcmcia/socket_sysfs.c')
| -rw-r--r-- | drivers/pcmcia/socket_sysfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pcmcia/socket_sysfs.c b/drivers/pcmcia/socket_sysfs.c index 78d5aab542f..7a456000332 100644 --- a/drivers/pcmcia/socket_sysfs.c +++ b/drivers/pcmcia/socket_sysfs.c @@ -164,7 +164,7 @@ static ssize_t pccard_store_irq_mask(struct device *dev, if (!count) return -EINVAL; - ret = sscanf (buf, "0x%x\n", &mask); + ret = sscanf(buf, "0x%x\n", &mask); if (ret == 1) { s->irq_mask &= mask; @@ -278,7 +278,7 @@ static ssize_t pccard_extract_cis(struct pcmcia_socket *s, char *buf, loff_t off free_tuple: kfree(tuplebuffer); - return (ret); + return ret; } static ssize_t pccard_show_cis(struct kobject *kobj, @@ -308,7 +308,7 @@ static ssize_t pccard_show_cis(struct kobject *kobj, count = pccard_extract_cis(s, buf, off, count); } - return (count); + return count; } static ssize_t pccard_store_cis(struct kobject *kobj, |