Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f7a2304 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

iommu: Return ERR_PTR() values from device_group call-backs 



The generic device_group call-backs in iommu.c return NULL
in case of error. Since they are getting ERR_PTR values from
iommu_group_alloc(), just pass them up instead.

Reported-by: default avatarGerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent aaffaa8a

drivers/iommu/iommu.c

+2 −12
Original line number Diff line number Diff line
@@ -915,13 +915,7 @@ static int get_pci_alias_or_group(struct pci_dev *pdev, u16 alias, void *opaque) 
 */

struct iommu_group *generic_device_group(struct device *dev)

{

	struct iommu_group *group;



	group = iommu_group_alloc();

	if (IS_ERR(group))

		return NULL;



	return group;

	return iommu_group_alloc();

}



/*
@@ -988,11 +982,7 @@ struct iommu_group *pci_device_group(struct device *dev) 
		return group;



	/* No shared group found, allocate new */

	group = iommu_group_alloc();

	if (IS_ERR(group))

		return NULL;



	return group;

	return iommu_group_alloc();

}



/**