Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 71920
b: refs/heads/master
c: 26f0324
h: refs/heads/master
v: v3
  • Loading branch information
Kyle McMartin authored and Kyle McMartin committed Oct 18, 2007
1 parent d76324c commit f13f43e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 19c4d5664aaf9419dfe6b24990a93305fded6403
refs/heads/master: 26f0324922e50e0ef7677aaf96287b862c2fec61
11 changes: 8 additions & 3 deletions trunk/drivers/parisc/pdc_stable.c
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@ pdcspath_hwpath_write(struct pdcspath_entry *entry, const char *buf, size_t coun
unsigned short i;
char in[count+1], *temp;
struct device *dev;
int ret;

if (!entry || !buf || !count)
return -EINVAL;
Expand Down Expand Up @@ -333,7 +334,9 @@ pdcspath_hwpath_write(struct pdcspath_entry *entry, const char *buf, size_t coun

/* Update the symlink to the real device */
sysfs_remove_link(&entry->kobj, "device");
sysfs_create_link(&entry->kobj, &entry->dev->kobj, "device");
ret = sysfs_create_link(&entry->kobj, &entry->dev->kobj, "device");
WARN_ON(ret);

write_unlock(&entry->rw_lock);

printk(KERN_INFO PDCS_PREFIX ": changed \"%s\" path to \"%s\"\n",
Expand Down Expand Up @@ -1003,8 +1006,10 @@ pdcs_register_pathentries(void)
entry->ready = 2;

/* Add a nice symlink to the real device */
if (entry->dev)
sysfs_create_link(&entry->kobj, &entry->dev->kobj, "device");
if (entry->dev) {
err = sysfs_create_link(&entry->kobj, &entry->dev->kobj, "device");
WARN_ON(err);
}

write_unlock(&entry->rw_lock);
}
Expand Down

0 comments on commit f13f43e

Please sign in to comment.