| Message ID | 20190219121608.19406-1-jonas.gorski@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | hwrng: bcm2835 - fix probe as platform device | expand |
On 2/19/19 4:16 AM, Jonas Gorski wrote: > BCM63XX (MIPS) does not use device tree, so there cannot be any > of_device_id, causing the driver to fail on probe: > > [ 0.904564] bcm2835-rng: probe of bcm63xx-rng failed with error -22 > > Fix this by checking for match data only if we are probing from device > tree. > > Fixes: 8705f24f7b57 ("hwrng: bcm2835 - Enable BCM2835 RNG to work on BCM63xx platforms") > Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> Acked-by: Florian Fainelli <f.fainelli@gmail.com> Sorry about that, thanks for the fix!
On Tue, Feb 19, 2019 at 01:16:08PM +0100, Jonas Gorski wrote: > BCM63XX (MIPS) does not use device tree, so there cannot be any > of_device_id, causing the driver to fail on probe: > > [ 0.904564] bcm2835-rng: probe of bcm63xx-rng failed with error -22 > > Fix this by checking for match data only if we are probing from device > tree. > > Fixes: 8705f24f7b57 ("hwrng: bcm2835 - Enable BCM2835 RNG to work on BCM63xx platforms") > Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> > --- > drivers/char/hw_random/bcm2835-rng.c | 18 ++++++++++-------- > 1 file changed, 10 insertions(+), 8 deletions(-) Patch applied. Thanks.
diff --git a/drivers/char/hw_random/bcm2835-rng.c b/drivers/char/hw_random/bcm2835-rng.c index 256b0b1d0f26..f759790c3cdb 100644 --- a/drivers/char/hw_random/bcm2835-rng.c +++ b/drivers/char/hw_random/bcm2835-rng.c @@ -168,14 +168,16 @@ static int bcm2835_rng_probe(struct platform_device *pdev) priv->rng.read = bcm2835_rng_read; priv->rng.cleanup = bcm2835_rng_cleanup; - rng_id = of_match_node(bcm2835_rng_of_match, np); - if (!rng_id) - return -EINVAL; - - /* Check for rng init function, execute it */ - of_data = rng_id->data; - if (of_data) - priv->mask_interrupts = of_data->mask_interrupts; + if (dev_of_node(dev)) { + rng_id = of_match_node(bcm2835_rng_of_match, np); + if (!rng_id) + return -EINVAL; + + /* Check for rng init function, execute it */ + of_data = rng_id->data; + if (of_data) + priv->mask_interrupts = of_data->mask_interrupts; + } /* register driver */ err = devm_hwrng_register(dev, &priv->rng);
BCM63XX (MIPS) does not use device tree, so there cannot be any of_device_id, causing the driver to fail on probe: [ 0.904564] bcm2835-rng: probe of bcm63xx-rng failed with error -22 Fix this by checking for match data only if we are probing from device tree. Fixes: 8705f24f7b57 ("hwrng: bcm2835 - Enable BCM2835 RNG to work on BCM63xx platforms") Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> --- drivers/char/hw_random/bcm2835-rng.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)