xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-2.6

Browse Source
This commit is contained in:
Linus Torvalds
2005-07-12 16:04:50 -07:00
parent 55ee3b8365 5028770a42
commit 3f603ed319
198 changed files with 7796 additions and 5469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/pcmcia/yenta_socket.c
View File

@@ -1105,6 +1105,7 @@ static int yenta_dev_suspend (struct pci_dev *dev, pm_message_t state)
pci_save_state(dev);
pci_read_config_dword(dev, 16*4, &socket->saved_state[0]);
pci_read_config_dword(dev, 17*4, &socket->saved_state[1]);
pci_disable_device(dev);
/*
* Some laptops (IBM T22) do not like us putting the Cardbus
@@ -1128,6 +1129,8 @@ static int yenta_dev_resume (struct pci_dev *dev)
pci_restore_state(dev);
pci_write_config_dword(dev, 16*4, socket->saved_state[0]);
pci_write_config_dword(dev, 17*4, socket->saved_state[1]);
pci_enable_device(dev);
pci_set_master(dev);
if (socket->type && socket->type->restore_state)
socket->type->restore_state(socket);