Skip to content

Commit

Permalink
Merge branches 'acpi-wdat' and 'acpi-cppc'
Browse files Browse the repository at this point in the history
* acpi-wdat:
  watchdog: wdat_wdt: Ping the watchdog on resume

* acpi-cppc:
  mailbox: PCC: Fix return value of pcc_mbox_request_channel()
  • Loading branch information
Rafael J. Wysocki committed Oct 21, 2016
3 parents 1001354 + 28e3d70 + d0679cf commit 956c897
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions drivers/watchdog/wdat_wdt.c
Original file line number Diff line number Diff line change
@@ -499,6 +499,10 @@ static int wdat_wdt_resume_noirq(struct device *dev)
ret = wdat_wdt_enable_reboot(wdat);
if (ret)
return ret;

ret = wdat_wdt_ping(&wdat->wdd);
if (ret)
return ret;
}

return wdat_wdt_start(&wdat->wdd);
2 changes: 1 addition & 1 deletion include/acpi/pcc.h
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 956c897

Please sign in to comment.