Merge tag 'v4.4-rc6' into devel
Linux 4.4-rc6
This commit is contained in:
@@ -672,7 +672,7 @@ static int pm8xxx_gpio_probe(struct platform_device *pdev)
|
||||
return -ENOMEM;
|
||||
|
||||
pctrl->dev = &pdev->dev;
|
||||
pctrl->npins = (unsigned)of_device_get_match_data(&pdev->dev);
|
||||
pctrl->npins = (unsigned long)of_device_get_match_data(&pdev->dev);
|
||||
|
||||
pctrl->regmap = dev_get_regmap(pdev->dev.parent, NULL);
|
||||
if (!pctrl->regmap) {
|
||||
|
Reference in New Issue
Block a user