lkml.org 
[lkml]   [2015]   [Nov]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] mtd: fsl-quadspi: possible NULL reference
    Date
    It is theoretically possible to probe this driver without a matching
    device tree, so let's guard against this.

    Also, use the of_device_get_match_data() helper to make this a bit
    simpler.

    Coverity complained about this one.

    Signed-off-by: Brian Norris <computersforpeace@gmail.com>
    Cc: Han Xu <han.xu@freescale.com>
    ---
    drivers/mtd/spi-nor/fsl-quadspi.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c
    index cc3a70b9b020..68fe7a2ecd5c 100644
    --- a/drivers/mtd/spi-nor/fsl-quadspi.c
    +++ b/drivers/mtd/spi-nor/fsl-quadspi.c
    @@ -933,8 +933,6 @@ static int fsl_qspi_probe(struct platform_device *pdev)
    struct spi_nor *nor;
    struct mtd_info *mtd;
    int ret, i = 0;
    - const struct of_device_id *of_id =
    - of_match_device(fsl_qspi_dt_ids, &pdev->dev);

    q = devm_kzalloc(dev, sizeof(*q), GFP_KERNEL);
    if (!q)
    @@ -945,7 +943,9 @@ static int fsl_qspi_probe(struct platform_device *pdev)
    return -ENODEV;

    q->dev = dev;
    - q->devtype_data = (struct fsl_qspi_devtype_data *)of_id->data;
    + q->devtype_data = of_device_get_match_data(dev);
    + if (!q->devtype_data)
    + return -ENODEV;
    platform_set_drvdata(pdev, q);

    /* find the resources */
    --
    2.6.0.rc2.230.g3dd15c0


    \
     
     \ /
      Last update: 2015-11-16 20:01    [W:3.594 / U:0.236 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site