diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-03-29 17:18:49 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-03-29 17:18:49 -0500 |
commit | e02a4cabfcb9a999b74a2e2e6f13ffcb7ff2d606 (patch) | |
tree | 2f3db60be4c57eca2a4c3ab3f3122dcf1ec0c624 /drivers/usb/core/file.c | |
parent | 600511e86babe3727264a0883a3a264f6fb6caf5 (diff) | |
parent | f3cab8a0b1a772dc8b055b7affa567a366627c9e (diff) |
Merge branch 'master'
Diffstat (limited to 'drivers/usb/core/file.c')
-rw-r--r-- | drivers/usb/core/file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c index 37b13368c814..b263a54a13c0 100644 --- a/drivers/usb/core/file.c +++ b/drivers/usb/core/file.c | |||
@@ -24,15 +24,15 @@ | |||
24 | #include "usb.h" | 24 | #include "usb.h" |
25 | 25 | ||
26 | #define MAX_USB_MINORS 256 | 26 | #define MAX_USB_MINORS 256 |
27 | static struct file_operations *usb_minors[MAX_USB_MINORS]; | 27 | static const struct file_operations *usb_minors[MAX_USB_MINORS]; |
28 | static DEFINE_SPINLOCK(minor_lock); | 28 | static DEFINE_SPINLOCK(minor_lock); |
29 | 29 | ||
30 | static int usb_open(struct inode * inode, struct file * file) | 30 | static int usb_open(struct inode * inode, struct file * file) |
31 | { | 31 | { |
32 | int minor = iminor(inode); | 32 | int minor = iminor(inode); |
33 | struct file_operations *c; | 33 | const struct file_operations *c; |
34 | int err = -ENODEV; | 34 | int err = -ENODEV; |
35 | struct file_operations *old_fops, *new_fops = NULL; | 35 | const struct file_operations *old_fops, *new_fops = NULL; |
36 | 36 | ||
37 | spin_lock (&minor_lock); | 37 | spin_lock (&minor_lock); |
38 | c = usb_minors[minor]; | 38 | c = usb_minors[minor]; |