diff options
| author | Jaroslav Kysela <perex@hera.kernel.org> | 2005-06-21 10:39:41 -0400 |
|---|---|---|
| committer | Jaroslav Kysela <perex@hera.kernel.org> | 2005-06-21 10:39:41 -0400 |
| commit | fae6ec69c84d71b1d5bda9ede1a262c1681684aa (patch) | |
| tree | eb4aff9a5c2b7d04ce09a3717bb1dd4a79fe7595 /drivers/block/genhd.c | |
| parent | bbc0274e9bb2e3f1d724d445a2bd32566b9b66f7 (diff) | |
| parent | 1d345dac1f30af1cd9f3a1faa12f9f18f17f236e (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/block/genhd.c')
| -rw-r--r-- | drivers/block/genhd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/genhd.c b/drivers/block/genhd.c index 8bbe01d4b487..53f7d846b747 100644 --- a/drivers/block/genhd.c +++ b/drivers/block/genhd.c | |||
| @@ -322,7 +322,7 @@ static ssize_t disk_attr_show(struct kobject *kobj, struct attribute *attr, | |||
| 322 | struct gendisk *disk = to_disk(kobj); | 322 | struct gendisk *disk = to_disk(kobj); |
| 323 | struct disk_attribute *disk_attr = | 323 | struct disk_attribute *disk_attr = |
| 324 | container_of(attr,struct disk_attribute,attr); | 324 | container_of(attr,struct disk_attribute,attr); |
| 325 | ssize_t ret = 0; | 325 | ssize_t ret = -EIO; |
| 326 | 326 | ||
| 327 | if (disk_attr->show) | 327 | if (disk_attr->show) |
| 328 | ret = disk_attr->show(disk,page); | 328 | ret = disk_attr->show(disk,page); |