diff options
| author | Mark Brown <broonie@kernel.org> | 2024-11-14 15:36:46 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-11-14 15:36:46 +0000 |
| commit | 9a5a75bf1f485e2d109303a996d147b94c5e79c9 (patch) | |
| tree | f931f0d17bef0b6ad980aaf3d2d8b874ef2b749c /drivers/usb/misc/onboard_usb_dev.c | |
| parent | f3f9f0de30a5106078cd610f80eaa6f9386b2186 (diff) | |
| parent | 3b7e11a0116c30848d44429650ad80f9cc3bd963 (diff) | |
ASoc: simple-mux: Allow to specify an idle-state
Merge series from "Hendrik v. Raven" <h.v.raven@merzmedtech.de>:
This series adds support for the idle-state property from the mux
framework to the simple-mux audio variant. It allows to specify the state
of the mux when it is not in use.
Diffstat (limited to 'drivers/usb/misc/onboard_usb_dev.c')
| -rw-r--r-- | drivers/usb/misc/onboard_usb_dev.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/misc/onboard_usb_dev.c b/drivers/usb/misc/onboard_usb_dev.c index 560591e02d6a..75dfdca04ff1 100644 --- a/drivers/usb/misc/onboard_usb_dev.c +++ b/drivers/usb/misc/onboard_usb_dev.c @@ -311,7 +311,7 @@ static void onboard_dev_attach_usb_driver(struct work_struct *work) static int onboard_dev_5744_i2c_init(struct i2c_client *client) { -#if IS_ENABLED(CONFIG_I2C) +#if IS_ENABLED(CONFIG_USB_ONBOARD_DEV_USB5744) struct device *dev = &client->dev; int ret; @@ -394,9 +394,11 @@ static int onboard_dev_probe(struct platform_device *pdev) i2c_node = of_parse_phandle(pdev->dev.of_node, "i2c-bus", 0); if (i2c_node) { - struct i2c_client *client; + struct i2c_client *client = NULL; +#if IS_ENABLED(CONFIG_USB_ONBOARD_DEV_USB5744) client = of_find_i2c_device_by_node(i2c_node); +#endif of_node_put(i2c_node); if (!client) { |