|
@@ -290,12 +290,11 @@ static int acp_hw_init(void *handle)
|
|
else if (r)
|
|
else if (r)
|
|
return r;
|
|
return r;
|
|
|
|
|
|
- r = cgs_get_pci_resource(adev->acp.cgs_device, CGS_RESOURCE_TYPE_MMIO,
|
|
|
|
- 0x5289, 0, &acp_base);
|
|
|
|
- if (r == -ENODEV)
|
|
|
|
- return 0;
|
|
|
|
- else if (r)
|
|
|
|
- return r;
|
|
|
|
|
|
+ if (adev->rmmio_size == 0 || adev->rmmio_size < 0x5289)
|
|
|
|
+ return -EINVAL;
|
|
|
|
+
|
|
|
|
+ acp_base = adev->rmmio_base;
|
|
|
|
+
|
|
if (adev->asic_type != CHIP_STONEY) {
|
|
if (adev->asic_type != CHIP_STONEY) {
|
|
adev->acp.acp_genpd = kzalloc(sizeof(struct acp_pm_domain), GFP_KERNEL);
|
|
adev->acp.acp_genpd = kzalloc(sizeof(struct acp_pm_domain), GFP_KERNEL);
|
|
if (adev->acp.acp_genpd == NULL)
|
|
if (adev->acp.acp_genpd == NULL)
|