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

Commit efec194f authored by Roel Kluin's avatar Roel Kluin Committed by Krzysztof Hałasa
Browse files

IXP4xx: Ensure index is positive in irq_to_gpio() and npe_request(). 



The indexes were signed, so negatives were possible.

Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Signed-off-by: default avatarKrzysztof Hałasa <khc@pm.waw.pl>
parent 9f2c9492

arch/arm/mach-ixp4xx/common.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ int gpio_to_irq(int gpio) 
}

EXPORT_SYMBOL(gpio_to_irq);



int irq_to_gpio(int irq)

int irq_to_gpio(unsigned int irq)

{

	int gpio = (irq < 32) ? irq2gpio[irq] : -EINVAL;

arch/arm/mach-ixp4xx/include/mach/gpio.h

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static inline void gpio_set_value(unsigned gpio, int value) 
#include <asm-generic/gpio.h>			/* cansleep wrappers */



extern int gpio_to_irq(int gpio);

extern int irq_to_gpio(int gpio);

extern int irq_to_gpio(unsigned int irq);



#endif

arch/arm/mach-ixp4xx/include/mach/npe.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ int npe_send_message(struct npe *npe, const void *msg, const char *what); 
int npe_recv_message(struct npe *npe, void *msg, const char *what);

int npe_send_recv_message(struct npe *npe, void *msg, const char *what);

int npe_load_firmware(struct npe *npe, const char *name, struct device *dev);

struct npe *npe_request(int id);

struct npe *npe_request(unsigned id);

void npe_release(struct npe *npe);



#endif /* __IXP4XX_NPE_H */

arch/arm/mach-ixp4xx/ixp4xx_npe.c

+1 −1
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ err: 
}





struct npe *npe_request(int id)

struct npe *npe_request(unsigned id)

{

	if (id < NPE_COUNT)

		if (npe_tab[id].valid)