Commita89bca2

andy-shev

authored and

rafaeljw

committed

ACPI / x86: boot: Propagate error code in acpi_gsi_to_irq()

acpi_get_override_irq() followed by acpi_register_gsi() returns negativeerror code on failure.Propagate it from acpi_gsi_to_irq() to callers.Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>[ rjw : Subject/changelog ]Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

1 parent7c7bcfe commita89bca2Copy full SHA for a89bca2

File tree

1 file changed

+10

-10

lines changed

arch/x86/kernel/acpi
- boot.c

1 file changed

+10

-10

lines changed

`‎arch/x86/kernel/acpi/boot.c‎`

Lines changed: 10 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -619,17 +619,17 @@ int acpi_gsi_to_irq(u32 gsi, unsigned int *irqp)`
`619`	`619`	`}`
`620`	`620`
`621`	`621`	`rc=acpi_get_override_irq(gsi,&trigger,&polarity);`
`622`		`-if (rc==0) {`
`623`		`-trigger=trigger ?ACPI_LEVEL_SENSITIVE :ACPI_EDGE_SENSITIVE;`
`624`		`-polarity=polarity ?ACPI_ACTIVE_LOW :ACPI_ACTIVE_HIGH;`
`625`		`-irq=acpi_register_gsi(NULL,gsi,trigger,polarity);`
`626`		`-if (irq >=0) {`
`627`		`-*irqp=irq;`
`628`		`-return0;`
`629`		`-}`
`630`		`-}`
	`622`	`+if (rc)`
	`623`	`+returnrc;`
`631`	`624`
`632`		`-return-1;`
	`625`	`+trigger=trigger ?ACPI_LEVEL_SENSITIVE :ACPI_EDGE_SENSITIVE;`
	`626`	`+polarity=polarity ?ACPI_ACTIVE_LOW :ACPI_ACTIVE_HIGH;`
	`627`	`+irq=acpi_register_gsi(NULL,gsi,trigger,polarity);`
	`628`	`+if (irq<0)`
	`629`	`+returnirq;`
	`630`	`+`
	`631`	`+*irqp=irq;`
	`632`	`+return0;`
`633`	`633`	`}`
`634`	`634`	`EXPORT_SYMBOL_GPL(acpi_gsi_to_irq);`
`635`	`635`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commita89bca2

File tree

1 file changed

1 file changed

`‎arch/x86/kernel/acpi/boot.c‎`

0 commit comments