diff mbox

at91: ohci: fixed broken sanity check

Message ID 1388507624-10636-1-git-send-email-jjhiblot@traphandler.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jean-Jacques Hiblot Dec. 31, 2013, 4:33 p.m. UTC 
From: jean-jacques hiblot <jean-jacques.hiblot@jdsu.com>

The test (pdev->resource[1].flags != IORESOURCE_IRQ) is broken because the flags
value may contain not only the information IORESSOURCE_IRQ but also the IRQ type
(IORESOURCE_IRQ_HIGHLEVEL for example).

Signed-off-by: Jean-Jacques Hiblot <jjhiblot@traphandler.com>
---
 drivers/usb/host/ohci-at91.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Boris BREZILLON Dec. 31, 2013, 5:25 p.m. UTC | #1 
Hello Jean-Jacques,

On 31/12/2013 17:33, jjhiblot@traphandler.com wrote:
> From: jean-jacques hiblot <jean-jacques.hiblot@jdsu.com>
>
> The test (pdev->resource[1].flags != IORESOURCE_IRQ) is broken because the flags
> value may contain not only the information IORESSOURCE_IRQ but also the IRQ type
> (IORESOURCE_IRQ_HIGHLEVEL for example).
>

This is already fixed: we moved to platform_get_irq and
platform_get_ressource instead of directly accessing platform
resource table.

See http://lists.openwall.net/linux-kernel/2013/12/08/128.

This solves both the problem you're reporting and another problem when
resources are in a different order (nothing guarantees the resources
order when using DT).

Best Regards,

Boris

> Signed-off-by: Jean-Jacques Hiblot <jjhiblot@traphandler.com>
> ---
>   drivers/usb/host/ohci-at91.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
> index 418444e..df9c8a4 100644
> --- a/drivers/usb/host/ohci-at91.c
> +++ b/drivers/usb/host/ohci-at91.c
> @@ -142,8 +142,8 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
>   		return -ENODEV;
>   	}
>
> -	if ((pdev->resource[0].flags != IORESOURCE_MEM)
> -			|| (pdev->resource[1].flags != IORESOURCE_IRQ)) {
> +	if (!(pdev->resource[0].flags & IORESOURCE_MEM)
> +			|| !(pdev->resource[1].flags & IORESOURCE_IRQ)) {
>   		pr_debug("hcd probe: invalid resource type\n");
>   		return -ENODEV;
>   	}
>
diff mbox

Patch

diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 418444e..df9c8a4 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -142,8 +142,8 @@  static int usb_hcd_at91_probe(const struct hc_driver *driver,
 		return -ENODEV;
 	}
 
-	if ((pdev->resource[0].flags != IORESOURCE_MEM)
-			|| (pdev->resource[1].flags != IORESOURCE_IRQ)) {
+	if (!(pdev->resource[0].flags & IORESOURCE_MEM)
+			|| !(pdev->resource[1].flags & IORESOURCE_IRQ)) {
 		pr_debug("hcd probe: invalid resource type\n");
 		return -ENODEV;
 	}