p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
Rafael J. Wysocki 2016-10-21 22:24:23 +02:00
parent 1001354ca3 28e3d7002b d0679cfaf5
commit 956c8974da
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/watchdog/wdat_wdt.c
View File

@ -499,6 +499,10 @@ static int wdat_wdt_resume_noirq(struct device *dev)
ret = wdat_wdt_enable_reboot(wdat); ret = wdat_wdt_enable_reboot(wdat);
if (ret) if (ret)
return ret; return ret;
ret = wdat_wdt_ping(&wdat->wdd);
if (ret)
return ret;
} }
return wdat_wdt_start(&wdat->wdd); return wdat_wdt_start(&wdat->wdd);

2
include/acpi/pcc.h
View File

@ -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, static inline struct mbox_chan *pcc_mbox_request_channel(struct mbox_client *cl,
int subspace_id) int subspace_id)
{ {
return NULL; return ERR_PTR(-ENODEV);
} }
static inline void pcc_mbox_free_channel(struct mbox_chan *chan) { } static inline void pcc_mbox_free_channel(struct mbox_chan *chan) { }
#endif #endif