From e9e63256d24fa0b634a344b2bd3def6aeedce0fe Mon Sep 17 00:00:00 2001 From: "akinobu.mita@gmail.com" Date: Thu, 17 Jul 2008 21:16:17 +0200 Subject: [PATCH] --- yaml --- r: 102393 b: refs/heads/master c: fa7f28939634c2ea36817a0c3dbd8d84972c1488 h: refs/heads/master i: 102391: c6f07490f3e73ab947042efe07e5e250284d9be2 v: v3 --- [refs] | 2 +- trunk/drivers/zorro/zorro-sysfs.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index fa13651457ef..44f1df70c5d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a6a26a3e652671a783563f1e9697c68bd19c40fc +refs/heads/master: fa7f28939634c2ea36817a0c3dbd8d84972c1488 diff --git a/trunk/drivers/zorro/zorro-sysfs.c b/trunk/drivers/zorro/zorro-sysfs.c index 808b4f8675c5..3da712cc7708 100644 --- a/trunk/drivers/zorro/zorro-sysfs.c +++ b/trunk/drivers/zorro/zorro-sysfs.c @@ -15,6 +15,7 @@ #include #include #include +#include #include "zorro.h" @@ -56,12 +57,6 @@ static ssize_t zorro_read_config(struct kobject *kobj, struct zorro_dev *z = to_zorro_dev(container_of(kobj, struct device, kobj)); struct ConfigDev cd; - unsigned int size = sizeof(cd); - - if (off > size) - return 0; - if (off+count > size) - count = size-off; /* Construct a ConfigDev */ memset(&cd, 0, sizeof(cd)); @@ -71,8 +66,7 @@ static ssize_t zorro_read_config(struct kobject *kobj, cd.cd_BoardAddr = (void *)zorro_resource_start(z); cd.cd_BoardSize = zorro_resource_len(z); - memcpy(buf, (void *)&cd+off, count); - return count; + return memory_read_from_buffer(buf, count, &off, &cd, sizeof(cd)); } static struct bin_attribute zorro_config_attr = {