diff options
| author | Jeff Garzik <jeff@garzik.org> | 2012-07-25 19:58:48 (GMT) |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2012-07-25 19:58:48 (GMT) |
| commit | 8407884dd9164ec18ed2afc00f56b87e36c51fcf (patch) | |
| tree | b6ea42c231d7d39f454de28a068d78ce11709770 /fs/proc/proc_devtree.c | |
| parent | dc7f71f486f4f5fa96f6dcf86833da020cde8a11 (diff) | |
| parent | bdc0077af574800d24318b6945cf2344e8dbb050 (diff) | |
| download | linux-8407884dd9164ec18ed2afc00f56b87e36c51fcf.tar.xz | |
Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream
Two bits were appended to the end of the bitfield
list in struct scsi_device. Resolve that conflict
by including both bits.
Conflicts:
include/scsi/scsi_device.h
Diffstat (limited to 'fs/proc/proc_devtree.c')
| -rw-r--r-- | fs/proc/proc_devtree.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c index 927cbd1..df7dd08 100644 --- a/fs/proc/proc_devtree.c +++ b/fs/proc/proc_devtree.c @@ -101,6 +101,11 @@ void proc_device_tree_update_prop(struct proc_dir_entry *pde, { struct proc_dir_entry *ent; + if (!oldprop) { + proc_device_tree_add_prop(pde, newprop); + return; + } + for (ent = pde->subdir; ent != NULL; ent = ent->next) if (ent->data == oldprop) break; |