summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkay.sievers@vrfy.org <kay.sievers@vrfy.org>2003-12-22 19:16:19 -0800
committerGreg KH <gregkh@suse.de>2005-04-26 21:13:09 -0700
commit958479a0dead606c6e44490a30a7040773654281 (patch)
treebb37ab1b6b6c9093eda833389b7d17a237082908
parent3e54036862061d8b81fca6cdd3d24bc9ceb53bc0 (diff)
[PATCH] add any valid device
-rw-r--r--namedev.c23
1 files changed, 1 insertions, 22 deletions
diff --git a/namedev.c b/namedev.c
index 5044870d32..7c422f7877 100644
--- a/namedev.c
+++ b/namedev.c
@@ -104,31 +104,10 @@ static int strcmp_pattern(const char *p, const char *s)
int add_config_dev(struct config_device *new_dev)
{
- struct list_head *tmp;
struct config_device *tmp_dev;
- /* update the values if we already have the device */
- list_for_each(tmp, &config_device_list) {
- struct config_device *dev = list_entry(tmp, struct config_device, node);
- if (strcmp_pattern(new_dev->name, dev->name))
- continue;
- if (strncmp(dev->bus, new_dev->bus, sizeof(dev->name)))
- continue;
- copy_var(dev, new_dev, type);
- copy_string(dev, new_dev, bus);
- copy_string(dev, new_dev, sysfs_file);
- copy_string(dev, new_dev, sysfs_value);
- copy_string(dev, new_dev, id);
- copy_string(dev, new_dev, place);
- copy_string(dev, new_dev, kernel_name);
- copy_string(dev, new_dev, exec_program);
- copy_string(dev, new_dev, symlink);
- return 0;
- }
-
- /* not found, add new structure to the device list */
tmp_dev = malloc(sizeof(*tmp_dev));
- if (!tmp_dev)
+ if (tmp_dev == NULL)
return -ENOMEM;
memcpy(tmp_dev, new_dev, sizeof(*tmp_dev));
list_add_tail(&tmp_dev->node, &config_device_list);