diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-12 17:52:52 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-12 17:52:52 -0400 |
| commit | 32ea89ecb25789b1b7db28146558587a42f3b372 (patch) | |
| tree | c5b3b33523b353f2eab2d8dcd2b3f069826cdc48 /fs/sysfs/inode.c | |
| parent | 58a7ce64426394a46e80cdc9440cc1e7c195e85d (diff) | |
| parent | a145410dccdb44f81d3b56763ef9b6f721f4e47c (diff) | |
Merge branch 'master'
Diffstat (limited to 'fs/sysfs/inode.c')
| -rw-r--r-- | fs/sysfs/inode.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c index 4c29ac41ac3e..f0b347bd12ca 100644 --- a/fs/sysfs/inode.c +++ b/fs/sysfs/inode.c | |||
| @@ -175,8 +175,7 @@ const unsigned char * sysfs_get_name(struct sysfs_dirent *sd) | |||
| 175 | struct bin_attribute * bin_attr; | 175 | struct bin_attribute * bin_attr; |
| 176 | struct sysfs_symlink * sl; | 176 | struct sysfs_symlink * sl; |
| 177 | 177 | ||
| 178 | if (!sd || !sd->s_element) | 178 | BUG_ON(!sd || !sd->s_element); |
| 179 | BUG(); | ||
| 180 | 179 | ||
| 181 | switch (sd->s_type) { | 180 | switch (sd->s_type) { |
| 182 | case SYSFS_DIR: | 181 | case SYSFS_DIR: |