aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/core/file.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-11-06 19:19:48 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-06 19:19:48 -0500
commitc287322c3aadf45ee15339bffdbc2e9117b9cc7a (patch)
tree47e4a8583a9c8cb11186815760fb9e600e43449f /drivers/usb/core/file.c
parentbe408cd3e1fef73e9408b196a79b9934697fe3b1 (diff)
parent7d49f0bac41ee9b012af1efe2f725d91a87a8fe9 (diff)
Merge tag 'usb-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB driver update from Greg KH: "Here's the big USB driver update for 3.13-rc1. It includes the usual xhci changes, EHCI updates to get the scheduling of USB transactions working better, and a raft of gadget and musb updates as well. All of this has been in linux-next for a while with no reported issues" * tag 'usb-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (305 commits) USB: Maintainers change for usb serial drivers usb: usbtest: support container id descriptor test usb: usbtest: support superspeed device capbility descriptor test usb: usbtest: support usb2 extension descriptor test usb: chipidea: only get vbus regulator for non-peripheral mode USB: ehci-atmel: add usb_clk for transition to CCF usb: cdc-wdm: ignore speed change notifications USB: cdc-wdm: support back-to-back USB_CDC_NOTIFY_RESPONSE_AVAILABLE notifications usbatm: Fix dynamic_debug / ratelimited atm_dbg and atm_rldbg macros printk: pr_debug_ratelimited: check state first to reduce "callbacks suppressed" messages usb: usbtest: support bos descriptor test for usb 3.0 USB: phy: samsung: Support multiple PHYs of same type usb: wusbcore: change WA_SEGS_MAX to a legal value usb: wusbcore: add a quirk for Alereon HWA device isoc behavior usb: wusbcore: combine multiple isoc frames in a single transfer request. usb: wusbcore: set the RPIPE wMaxPacketSize value correctly usb: chipidea: host: more enhancement when ci->hcd is NULL usb: ohci: remove ep93xx bus glue platform driver usb: usbtest: fix checkpatch warning as sizeof code style UWB: clean up attribute use by using ATTRIBUTE_GROUPS() ...
Diffstat (limited to 'drivers/usb/core/file.c')
-rw-r--r--drivers/usb/core/file.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c
index 7421888087a3..3bdfbf88a0ae 100644
--- a/drivers/usb/core/file.c
+++ b/drivers/usb/core/file.c
@@ -8,7 +8,7 @@
8 * (C) Copyright Deti Fliegl 1999 (new USB architecture) 8 * (C) Copyright Deti Fliegl 1999 (new USB architecture)
9 * (C) Copyright Randy Dunlap 2000 9 * (C) Copyright Randy Dunlap 2000
10 * (C) Copyright David Brownell 2000-2001 (kernel hotplug, usb_device_id, 10 * (C) Copyright David Brownell 2000-2001 (kernel hotplug, usb_device_id,
11 more docs, etc) 11 * more docs, etc)
12 * (C) Copyright Yggdrasil Computing, Inc. 2000 12 * (C) Copyright Yggdrasil Computing, Inc. 2000
13 * (usb_device_id matching changes by Adam J. Richter) 13 * (usb_device_id matching changes by Adam J. Richter)
14 * (C) Copyright Greg Kroah-Hartman 2002-2003 14 * (C) Copyright Greg Kroah-Hartman 2002-2003
@@ -27,7 +27,7 @@
27static const struct file_operations *usb_minors[MAX_USB_MINORS]; 27static const struct file_operations *usb_minors[MAX_USB_MINORS];
28static DECLARE_RWSEM(minor_rwsem); 28static DECLARE_RWSEM(minor_rwsem);
29 29
30static int usb_open(struct inode * inode, struct file * file) 30static int usb_open(struct inode *inode, struct file *file)
31{ 31{
32 int minor = iminor(inode); 32 int minor = iminor(inode);
33 const struct file_operations *c; 33 const struct file_operations *c;
@@ -44,7 +44,7 @@ static int usb_open(struct inode * inode, struct file * file)
44 file->f_op = new_fops; 44 file->f_op = new_fops;
45 /* Curiouser and curiouser... NULL ->open() as "no device" ? */ 45 /* Curiouser and curiouser... NULL ->open() as "no device" ? */
46 if (file->f_op->open) 46 if (file->f_op->open)
47 err = file->f_op->open(inode,file); 47 err = file->f_op->open(inode, file);
48 if (err) { 48 if (err) {
49 fops_put(file->f_op); 49 fops_put(file->f_op);
50 file->f_op = fops_get(old_fops); 50 file->f_op = fops_get(old_fops);
@@ -166,7 +166,7 @@ int usb_register_dev(struct usb_interface *intf,
166 char *temp; 166 char *temp;
167 167
168#ifdef CONFIG_USB_DYNAMIC_MINORS 168#ifdef CONFIG_USB_DYNAMIC_MINORS
169 /* 169 /*
170 * We don't care what the device tries to start at, we want to start 170 * We don't care what the device tries to start at, we want to start
171 * at zero to pack the devices into the smallest available space with 171 * at zero to pack the devices into the smallest available space with
172 * no holes in the minor range. 172 * no holes in the minor range.