--- zzzz-none-000/linux-2.6.13.1/drivers/usb/core/inode.c 2005-09-10 02:42:58.000000000 +0000 +++ ohio-7170-487/linux-2.6.13.1/drivers/usb/core/inode.c 2007-08-17 12:10:39.000000000 +0000 @@ -269,7 +269,7 @@ break; } } - return inode; + return inode; } /* SMP-safe */ @@ -386,13 +386,13 @@ if (offset > 0) { file->f_pos = offset; retval = file->f_pos; - } + } break; case 1: if ((offset + file->f_pos) > 0) { file->f_pos += offset; retval = file->f_pos; - } + } break; default: break; @@ -468,7 +468,7 @@ int error = 0; /* If the parent is not specified, we create it in the root. - * We need the root dentry to do this, which is in the super + * We need the root dentry to do this, which is in the super * block. A pointer to that is in the struct vfsmount that we * have around. */ @@ -489,7 +489,7 @@ if (!IS_ERR(dentry)) { if ((mode & S_IFMT) == S_IFDIR) error = usbfs_mkdir (parent->d_inode, *dentry, mode); - else + else error = usbfs_create (parent->d_inode, *dentry, mode); } else error = PTR_ERR(dentry); @@ -528,7 +528,7 @@ static void fs_remove_file (struct dentry *dentry) { struct dentry *parent = dentry->d_parent; - + if (!parent || !parent->d_inode) return; @@ -593,7 +593,7 @@ } goto exit; - + error_clean_mounts: simple_release_fs(&usbfs_mount, &usbfs_mount_count); exit: @@ -722,7 +722,9 @@ /* --------------------------------------------------------------------- */ +#if defined(CONFIG_PROC_FS) static struct proc_dir_entry *usbdir = NULL; +#endif /*--- #if defined(CONFIG_PROC_FS) ---*/ int __init usbfs_init(void) { @@ -739,7 +741,9 @@ } /* create mount point for usbfs */ +#if defined(CONFIG_PROC_FS) usbdir = proc_mkdir("usb", proc_bus); +#endif /*--- #if defined(CONFIG_PROC_FS) ---*/ return 0; } @@ -748,7 +752,9 @@ { usb_deregister(&usbfs_driver); unregister_filesystem(&usb_fs_type); +#if defined(CONFIG_PROC_FS) if (usbdir) remove_proc_entry("usb", proc_bus); +#endif /*--- #if defined(CONFIG_PROC_FS) ---*/ }