From: Dominik Brodowski Date: Tue, 30 Mar 2010 16:23:24 +0000 (+0200) Subject: pcmcia: remove suspend-related comment from yenta_socket.c X-Git-Tag: v2.6.35-rc1~483^2~9 X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=378b451ede192163780bb15b1ad0a913aa8ee4ae;p=safe%2Fjmp%2Flinux-2.6 pcmcia: remove suspend-related comment from yenta_socket.c While pci_set_power_state() is called by the PCI core unconditionally on all PCI devices, it is not called on _any_ PCI bridge device. Therefore, it is not surprising calling pci_set_power_state() on CardBus devices causes trouble. CC: dbrownell@users.sourceforge.net CC: gregkh@suse.de Signed-off-by: Dominik Brodowski --- diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c index 83ace27..424e576 100644 --- a/drivers/pcmcia/yenta_socket.c +++ b/drivers/pcmcia/yenta_socket.c @@ -1303,13 +1303,6 @@ static int yenta_dev_suspend_noirq(struct device *dev) pci_read_config_dword(pdev, 17*4, &socket->saved_state[1]); pci_disable_device(pdev); - /* - * Some laptops (IBM T22) do not like us putting the Cardbus - * bridge into D3. At a guess, some other laptop will - * probably require this, so leave it commented out for now. - */ - /* pci_set_power_state(dev, 3); */ - return 0; }