Nouveau - Feb 2016 - [PATCH] pci: fix typo in nvkm_pcie_set_link()

Fix a test that would either do nothing on PCI systems, or crash badly
on Tegra.

Signed-off-by: Alexandre Courbot <acourbot at nvidia.com>
Cc: Karol Herbst <nouveau at karolherbst.de>
---
 drm/nouveau/nvkm/subdev/pci/pcie.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drm/nouveau/nvkm/subdev/pci/pcie.c
b/drm/nouveau/nvkm/subdev/pci/pcie.c
index b32954f5311e..d71e5db5028a 100644
--- a/drm/nouveau/nvkm/subdev/pci/pcie.c
+++ b/drm/nouveau/nvkm/subdev/pci/pcie.c
@@ -119,7 +119,7 @@ nvkm_pcie_set_link(struct nvkm_pci *pci, enum
nvkm_pcie_speed speed, u8 width)
 	struct pci_bus *pbus;
 	int ret;
 
-	if (pci || !pci_is_pcie(pci->pdev))
+	if (!pci || !pci_is_pcie(pci->pdev))
 		return 0;
 	pbus = pci->pdev->bus;
 
-- 
2.7.0

On 02/03/2016 10:33 AM, Alexandre Courbot wrote:
> Fix a test that would either do nothing on PCI systems, or crash badly
> on Tegra.
>
> Signed-off-by: Alexandre Courbot <acourbot at nvidia.com>
> Cc: Karol Herbst <nouveau at karolherbst.de>
> ---
>   drm/nouveau/nvkm/subdev/pci/pcie.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drm/nouveau/nvkm/subdev/pci/pcie.c
b/drm/nouveau/nvkm/subdev/pci/pcie.c
> index b32954f5311e..d71e5db5028a 100644
> --- a/drm/nouveau/nvkm/subdev/pci/pcie.c
> +++ b/drm/nouveau/nvkm/subdev/pci/pcie.c
> @@ -119,7 +119,7 @@ nvkm_pcie_set_link(struct nvkm_pci *pci, enum
nvkm_pcie_speed speed, u8 width)
>   	struct pci_bus *pbus;
>   	int ret;
>
> -	if (pci || !pci_is_pcie(pci->pdev))
> +	if (!pci || !pci_is_pcie(pci->pdev))
>   		return 0;
>   	pbus = pci->pdev->bus;
This has already been fixed but Ben still didn't apply this change to 
his repository.

http://cgit.freedesktop.org/~airlied/linux/tree/drivers/gpu/drm/nouveau/nvkm/subdev/pci/pcie.c?h=drm-next#n122
>
>
-- 
-Samuel

On Wed, Feb 3, 2016 at 7:03 PM, Samuel Pitoiset
<samuel.pitoiset at gmail.com> wrote:
>
>
> On 02/03/2016 10:33 AM, Alexandre Courbot wrote:
>>
>> Fix a test that would either do nothing on PCI systems, or crash badly
>> on Tegra.
>>
>> Signed-off-by: Alexandre Courbot <acourbot at nvidia.com>
>> Cc: Karol Herbst <nouveau at karolherbst.de>
>> ---
>>   drm/nouveau/nvkm/subdev/pci/pcie.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drm/nouveau/nvkm/subdev/pci/pcie.c
>> b/drm/nouveau/nvkm/subdev/pci/pcie.c
>> index b32954f5311e..d71e5db5028a 100644
>> --- a/drm/nouveau/nvkm/subdev/pci/pcie.c
>> +++ b/drm/nouveau/nvkm/subdev/pci/pcie.c
>> @@ -119,7 +119,7 @@ nvkm_pcie_set_link(struct nvkm_pci *pci, enum
>> nvkm_pcie_speed speed, u8 width)
>>         struct pci_bus *pbus;
>>         int ret;
>>
>> -       if (pci || !pci_is_pcie(pci->pdev))
>> +       if (!pci || !pci_is_pcie(pci->pdev))
>>                 return 0;
>>         pbus = pci->pdev->bus;
>
>
> This has already been fixed but Ben still didn't apply this change to
his
> repository.
>
>
http://cgit.freedesktop.org/~airlied/linux/tree/drivers/gpu/drm/nouveau/nvkm/subdev/pci/pcie.c?h=drm-next#n122
Ah, perfect then. Dropping this patch.

Cheers,
Alex.