diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 19:00:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 19:00:33 -0400 |
| commit | 1d345dac1f30af1cd9f3a1faa12f9f18f17f236e (patch) | |
| tree | 42a7deda7589edf704fe60dc262046755bd3f6a8 /drivers/firmware/edd.c | |
| parent | fb395884576684ebb54b19b1054f4caed589d5f0 (diff) | |
| parent | 87c8a4433b608261a9becdb0ce2d2f2ed4b71d05 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'drivers/firmware/edd.c')
| -rw-r--r-- | drivers/firmware/edd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c index 33b669e6f977..6996476669f1 100644 --- a/drivers/firmware/edd.c +++ b/drivers/firmware/edd.c | |||
| @@ -115,7 +115,7 @@ edd_attr_show(struct kobject * kobj, struct attribute *attr, char *buf) | |||
| 115 | { | 115 | { |
| 116 | struct edd_device *dev = to_edd_device(kobj); | 116 | struct edd_device *dev = to_edd_device(kobj); |
| 117 | struct edd_attribute *edd_attr = to_edd_attr(attr); | 117 | struct edd_attribute *edd_attr = to_edd_attr(attr); |
| 118 | ssize_t ret = 0; | 118 | ssize_t ret = -EIO; |
| 119 | 119 | ||
| 120 | if (edd_attr->show) | 120 | if (edd_attr->show) |
| 121 | ret = edd_attr->show(dev, buf); | 121 | ret = edd_attr->show(dev, buf); |