mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge branches 'acpi-wdat' and 'acpi-cppc'
* acpi-wdat: watchdog: wdat_wdt: Ping the watchdog on resume * acpi-cppc: mailbox: PCC: Fix return value of pcc_mbox_request_channel()
This commit is contained in:
commit
956c8974da
2 changed files with 5 additions and 1 deletions
|
|
@ -21,7 +21,7 @@ extern void pcc_mbox_free_channel(struct mbox_chan *chan);
|
|||
static inline struct mbox_chan *pcc_mbox_request_channel(struct mbox_client *cl,
|
||||
int subspace_id)
|
||||
{
|
||||
return NULL;
|
||||
return ERR_PTR(-ENODEV);
|
||||
}
|
||||
static inline void pcc_mbox_free_channel(struct mbox_chan *chan) { }
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue