Skip to content

Commit 3750c11

Browse files
committed
Revert "add toggle for disabling newly added USB devices"
This has been replaced by the dwc3 usb_data_enabled toggle. This reverts commit 937de26. Change-Id: Iccef7773009b72b69058af363eb2035d73469aac
1 parent 6fe87b7 commit 3750c11

File tree

2 files changed

+0
-23
lines changed

2 files changed

+0
-23
lines changed

drivers/usb/core/hub.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
#define USB_VENDOR_GENESYS_LOGIC 0x05e3
3737
#define HUB_QUIRK_CHECK_PORT_AUTOSUSPEND 0x01
3838

39-
extern int deny_new_usb;
40-
4139
/* Protect struct usb_device->state and ->children members
4240
* Note: Both are also protected by ->dev.sem, except that ->state can
4341
* change to USB_STATE_NOTATTACHED even when the semaphore isn't held. */
@@ -4904,12 +4902,6 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
49044902
goto done;
49054903
return;
49064904
}
4907-
4908-
if (deny_new_usb) {
4909-
dev_err(&port_dev->dev, "denied insert of USB device on port %d\n", port1);
4910-
goto done;
4911-
}
4912-
49134905
if (hub_is_superspeed(hub->hdev))
49144906
unit_load = 150;
49154907
else

kernel/sysctl.c

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,6 @@
9898
#if defined(CONFIG_SYSCTL)
9999

100100
/* External variables not in a header file. */
101-
#ifdef CONFIG_USB
102-
int deny_new_usb __read_mostly = 0;
103-
EXPORT_SYMBOL(deny_new_usb);
104-
#endif
105101
extern int suid_dumpable;
106102
#ifdef CONFIG_COREDUMP
107103
extern int core_uses_pid;
@@ -1007,17 +1003,6 @@ static struct ctl_table kern_table[] = {
10071003
.extra1 = &zero,
10081004
.extra2 = &two,
10091005
},
1010-
#endif
1011-
#ifdef CONFIG_USB
1012-
{
1013-
.procname = "deny_new_usb",
1014-
.data = &deny_new_usb,
1015-
.maxlen = sizeof(int),
1016-
.mode = 0644,
1017-
.proc_handler = proc_dointvec_minmax_sysadmin,
1018-
.extra1 = &zero,
1019-
.extra2 = &one,
1020-
},
10211006
#endif
10221007
{
10231008
.procname = "ngroups_max",

0 commit comments

Comments
 (0)