mirror of https://gitee.com/openkylin/linux.git
Merge remote-tracking branch 'asoc/topic/txx9' into asoc-next
This commit is contained in:
commit
dc52399bdf
|
@ -184,9 +184,6 @@ static int txx9aclc_ac97_dev_probe(struct platform_device *pdev)
|
||||||
if (irq < 0)
|
if (irq < 0)
|
||||||
return irq;
|
return irq;
|
||||||
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||||
if (!r)
|
|
||||||
return -EBUSY;
|
|
||||||
|
|
||||||
drvdata->base = devm_ioremap_resource(&pdev->dev, r);
|
drvdata->base = devm_ioremap_resource(&pdev->dev, r);
|
||||||
if (IS_ERR(drvdata->base))
|
if (IS_ERR(drvdata->base))
|
||||||
return PTR_ERR(drvdata->base);
|
return PTR_ERR(drvdata->base);
|
||||||
|
|
Loading…
Reference in New Issue