Commit d95699be authored by Rob Herring's avatar Rob Herring Committed by Greg Kroah-Hartman

usb: chipidea: allow multiple instances to use default ci_default_pdata

Currently, ci_default_pdata is common to all instances of the driver and
gets modified by the core driver code. This is bad if there are multiple
instances of the device with different settings such as the phy type. Fix
this by making a copy of the default platform_data.
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Cc: Peter Chen <Peter.Chen@freescale.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9d062b9b
...@@ -25,7 +25,7 @@ struct ci_hdrc_usb2_priv { ...@@ -25,7 +25,7 @@ struct ci_hdrc_usb2_priv {
struct clk *clk; struct clk *clk;
}; };
static struct ci_hdrc_platform_data ci_default_pdata = { static const struct ci_hdrc_platform_data ci_default_pdata = {
.capoffset = DEF_CAPOFFSET, .capoffset = DEF_CAPOFFSET,
.flags = CI_HDRC_DISABLE_STREAMING, .flags = CI_HDRC_DISABLE_STREAMING,
}; };
...@@ -37,8 +37,10 @@ static int ci_hdrc_usb2_probe(struct platform_device *pdev) ...@@ -37,8 +37,10 @@ static int ci_hdrc_usb2_probe(struct platform_device *pdev)
struct ci_hdrc_platform_data *ci_pdata = dev_get_platdata(dev); struct ci_hdrc_platform_data *ci_pdata = dev_get_platdata(dev);
int ret; int ret;
if (!ci_pdata) if (!ci_pdata) {
ci_pdata = &ci_default_pdata; ci_pdata = devm_kmalloc(dev, sizeof(*ci_pdata), GFP_KERNEL);
*ci_pdata = ci_default_pdata; /* struct copy */
}
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
if (!priv) if (!priv)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment