mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge branches 'pnp', 'powercap', 'pm-runtime' and 'pm-opp'
* pnp: MAINTAINERS: Remove Bjorn Helgaas as PNP maintainer PNP / resources: remove positive test on unsigned values * powercap: powercap / RAPL: add new CPU IDs powercap / RAPL: further relax energy counter checks * pm-runtime: PM / runtime: Update documentation to reflect the current code flow * pm-opp: PM / OPP: discard duplicate OPPs PM / OPP: Make OPP invisible to users in Kconfig PM / OPP: fix incorrect OPP count handling in of_init_opp_table
This commit is contained in:
commit
cd0c5bd391
6 changed files with 52 additions and 40 deletions
|
|
@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
|
|||
return 1;
|
||||
|
||||
/* check if the resource is valid */
|
||||
if (*irq < 0 || *irq > 15)
|
||||
if (*irq > 15)
|
||||
return 0;
|
||||
|
||||
/* check if the resource is reserved */
|
||||
|
|
@ -424,7 +424,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
|
|||
return 1;
|
||||
|
||||
/* check if the resource is valid */
|
||||
if (*dma < 0 || *dma == 4 || *dma > 7)
|
||||
if (*dma == 4 || *dma > 7)
|
||||
return 0;
|
||||
|
||||
/* check if the resource is reserved */
|
||||
|
|
|
|||
Loading…
Reference in a new issue