Skip to content

4.4 proyvind fixed #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
proyvind wants to merge 3 commits into
base: 4.4
Choose a base branch
from
Open

4.4 proyvind fixed #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
824471d
bone_capemgr: do sysfs_remove_groups() when unloading module
proyvind Jun 26, 2016
61b306d
usbcore: export usb_match_device & usb_bus_id
proyvind Jun 26, 2016
ef5b99e
pinmux-helper: add missing gpio_pu & gpio_pd modes for P8_18_pinmux
proyvind Jun 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/am335x-bone-common-universal.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1077,7 +1077,7 @@
P8_18_pinmux {
compatible = "bone-pinmux-helper";
status = "okay";
pinctrl-names = "default", "gpio";
pinctrl-names = "default", "gpio", "gpio_pu", "gpio_pd";
pinctrl-0 = <&P8_18_default_pin>;
pinctrl-1 = <&P8_18_gpio_pin>;
pinctrl-2 = <&P8_18_gpio_pu_pin>;
Expand Down
1 change: 1 addition & 0 deletions drivers/misc/bone_capemgr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1850,6 +1850,7 @@ static int capemgr_remove(struct platform_device *pdev)
capemgr_remove_slot_no_lock(slot);
mutex_unlock(&info->slots_list_mutex);

sysfs_remove_groups(&pdev->dev.kobj, pdev->dev.groups);
platform_set_drvdata(pdev, NULL);

ret = pm_runtime_get_sync(&pdev->dev);
Expand Down
2 changes: 2 additions & 0 deletions drivers/usb/core/driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,6 +637,7 @@ int usb_match_device(struct usb_device *dev, const struct usb_device_id *id)

return 1;
}
EXPORT_SYMBOL_GPL(usb_match_device);

/* returns 0 if no match, 1 if match */
int usb_match_one_id_intf(struct usb_device *dev,
Expand Down Expand Up @@ -1885,3 +1886,4 @@ struct bus_type usb_bus_type = {
.match = usb_device_match,
.uevent = usb_uevent,
};
EXPORT_SYMBOL_GPL(usb_bus_type);