diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-11-07 17:16:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-11-07 17:16:18 -0800 |
| commit | 35d5a4b59c47552893614c007899d85c2dd151cd (patch) | |
| tree | 03233f658d7b5c75e4471c2ab8fa07535cb544dd | |
| parent | aaf75c12437681bd22c2b551a4b5485e8176531a (diff) | |
| parent | 6c5439180d122fee4d30488cab855c95a65a6c64 (diff) | |
Merge master.kernel.org:/home/davem/BK/net-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
| -rw-r--r-- | fs/partitions/check.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/partitions/check.c b/fs/partitions/check.c index 2eccb8265d66..ac92ee0ce102 100644 --- a/fs/partitions/check.c +++ b/fs/partitions/check.c @@ -294,7 +294,7 @@ static ssize_t part_attr_show(struct kobject * kobj, struct attribute * attr, struct part_attribute * part_attr = container_of(attr,struct part_attribute,attr); ssize_t ret = 0; if (part_attr->show) - part_attr->show(p,page,count,off); + ret = part_attr->show(p,page,count,off); return ret; } |