Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'char-misc-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc fix from Greg KH:
"Here is one fix, in the extcon subsystem, that resolves a reported
issue.
It's been in linux-next for a number of weeks now, sorry for not
getting it to you sooner"
* tag 'char-misc-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
extcon: usb-gpio: register extcon device before IRQ registration
+12
-12
+12
-12
drivers/extcon/extcon-usb-gpio.c
+12
-12
drivers/extcon/extcon-usb-gpio.c
···
119
119
return PTR_ERR(info->id_gpiod);
120
120
}
121
121
122
+
info->edev = devm_extcon_dev_allocate(dev, usb_extcon_cable);
123
+
if (IS_ERR(info->edev)) {
124
+
dev_err(dev, "failed to allocate extcon device\n");
125
+
return -ENOMEM;
126
+
}
127
+
128
+
ret = devm_extcon_dev_register(dev, info->edev);
129
+
if (ret < 0) {
130
+
dev_err(dev, "failed to register extcon device\n");
131
+
return ret;
132
+
}
133
+
122
134
ret = gpiod_set_debounce(info->id_gpiod,
123
135
USB_GPIO_DEBOUNCE_MS * 1000);
124
136
if (ret < 0)
···
151
139
pdev->name, info);
152
140
if (ret < 0) {
153
141
dev_err(dev, "failed to request handler for ID IRQ\n");
154
-
return ret;
155
-
}
156
-
157
-
info->edev = devm_extcon_dev_allocate(dev, usb_extcon_cable);
158
-
if (IS_ERR(info->edev)) {
159
-
dev_err(dev, "failed to allocate extcon device\n");
160
-
return -ENOMEM;
161
-
}
162
-
163
-
ret = devm_extcon_dev_register(dev, info->edev);
164
-
if (ret < 0) {
165
-
dev_err(dev, "failed to register extcon device\n");
166
142
return ret;
167
143
}
168
144