diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-02-18 08:36:45 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-02-18 08:36:45 +0100 |
| commit | b8ed83076ffdc2c6831061003afaecf8ba802aab (patch) | |
| tree | a77534284a19b24945c097a317bf8c41e1d499ff /drivers | |
| parent | 801119922cb086ea7fc9f9194253a180d40581cb (diff) | |
| parent | 73dda8a0f7b5f3fdec45b8cb9e936fac79105ab7 (diff) | |
| download | barebox-b8ed83076ffdc2c6831061003afaecf8ba802aab.tar.gz barebox-b8ed83076ffdc2c6831061003afaecf8ba802aab.tar.xz | |
Merge branch 'for-next/parameter'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mci/mci-core.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c index e5b5e8a275..34aaee54f9 100644 --- a/drivers/mci/mci-core.c +++ b/drivers/mci/mci-core.c @@ -1822,6 +1822,7 @@ static int mci_detect(struct device_d *dev) int mci_register(struct mci_host *host) { struct mci *mci; + struct param_d *param_probe; int ret; mci = xzalloc(sizeof(*mci)); @@ -1853,11 +1854,11 @@ int mci_register(struct mci_host *host) dev_info(mci->host->hw_dev, "registered as %s\n", dev_name(&mci->dev)); - mci->param_probe = dev_add_param_bool(&mci->dev, "probe", + param_probe = dev_add_param_bool(&mci->dev, "probe", mci_set_probe, NULL, &mci->probe, mci); - if (IS_ERR(mci->param_probe) && PTR_ERR(mci->param_probe) != -ENOSYS) { - ret = PTR_ERR(mci->param_probe); + if (IS_ERR(param_probe) && PTR_ERR(param_probe) != -ENOSYS) { + ret = PTR_ERR(param_probe); dev_dbg(&mci->dev, "Failed to add 'probe' parameter to the MCI device\n"); goto err_unregister; } |