i2c: i801: Save register SMBSLVCMD value only once
Saving the original value of register SMBSLVCMD in
i801_enable_host_notify() doesn't work, because this function is
called not only at probe time but also at resume time. Do it in
i801_probe() instead, so that the saved value is not overwritten at
resume time.
Signed-off-by: Jean Delvare <jdelvare@suse.de>
Fixes: 22e94bd677
("i2c: i801: store and restore the SLVCMD register at load and unload")
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Tested-by: Jason Andryuk <jandryuk@gmail.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Cc: stable@vger.kernel.org # v4.10+
This commit is contained in:
Родитель
8837c70d53
Коммит
a086bb8317
|
@ -966,8 +966,6 @@ static void i801_enable_host_notify(struct i2c_adapter *adapter)
|
|||
if (!(priv->features & FEATURE_HOST_NOTIFY))
|
||||
return;
|
||||
|
||||
priv->original_slvcmd = inb_p(SMBSLVCMD(priv));
|
||||
|
||||
if (!(SMBSLVCMD_HST_NTFY_INTREN & priv->original_slvcmd))
|
||||
outb_p(SMBSLVCMD_HST_NTFY_INTREN | priv->original_slvcmd,
|
||||
SMBSLVCMD(priv));
|
||||
|
@ -1615,6 +1613,10 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
|
|||
outb_p(inb_p(SMBAUXCTL(priv)) &
|
||||
~(SMBAUXCTL_CRC | SMBAUXCTL_E32B), SMBAUXCTL(priv));
|
||||
|
||||
/* Remember original Host Notify setting */
|
||||
if (priv->features & FEATURE_HOST_NOTIFY)
|
||||
priv->original_slvcmd = inb_p(SMBSLVCMD(priv));
|
||||
|
||||
/* Default timeout in interrupt mode: 200 ms */
|
||||
priv->adapter.timeout = HZ / 5;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче