Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 956c8974 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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()
parents 1001354c 28e3d700 d0679cfa

drivers/watchdog/wdat_wdt.c

+4 −0
Original line number Diff line number Diff line
@@ -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);

include/acpi/pcc.h

+1 −1
Original line number Diff line number Diff line
@@ -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