Skip to content

Commit

Permalink
[POWERPC] XilinxFB: Make missing pdata structure non-fatal
Browse files Browse the repository at this point in the history
Missing pdata structure is not a fatal error.  The device can still be
initialized without it.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
  • Loading branch information
Grant Likely committed Oct 10, 2007
1 parent 31e8d46 commit e3cec00
Showing 1 changed file with 10 additions and 12 deletions.
22 changes: 10 additions & 12 deletions drivers/video/xilinxfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -349,15 +349,9 @@ xilinxfb_platform_probe(struct platform_device *pdev)
{
struct xilinxfb_platform_data *pdata;
struct resource *res;
int width_mm;
int height_mm;
int rotate;

pdata = pdev->dev.platform_data;
if (!pdata) {
dev_err(&pdev->dev, "Missing pdata structure\n");
return -ENODEV;
}
int width_mm = 0;
int height_mm = 0;
int rotate = 0;

/* Find the registers address */
res = platform_get_resource(pdev, IORESOURCE_IO, 0);
Expand All @@ -366,9 +360,13 @@ xilinxfb_platform_probe(struct platform_device *pdev)
return -ENODEV;
}

height_mm = pdata->screen_height_mm;
width_mm = pdata->screen_width_mm;
rotate = pdata->rotate_screen ? 1 : 0;
/* If a pdata structure is provided, then extract the parameters */
pdata = pdev->dev.platform_data;
if (pdata) {
height_mm = pdata->screen_height_mm;
width_mm = pdata->screen_width_mm;
rotate = pdata->rotate_screen ? 1 : 0;
}

return xilinxfb_assign(&pdev->dev, res->start, width_mm, height_mm,
rotate);
Expand Down

0 comments on commit e3cec00

Please sign in to comment.