lkml.org 
[lkml]   [2005]   [Sep]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    SubjectRe: 2.6.13-mm2
    Date
    On Thursday, 8 of September 2005 14:30, Andrew Morton wrote:
    >
    > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13/2.6.13-mm2/
    >
    > (kernel.org propagation is slow. There's a temp copy at
    > http://www.zip.com.au/~akpm/linux/patches/stuff/2.6.13-mm2.bz2)

    Could you please reintroduce the yenta-free_irq-on-suspend.patch (attached)
    into -mm? My box does not resume from disk without it.

    Greetings,
    Rafael


    --
    - Would you tell me, please, which way I ought to go from here?
    - That depends a good deal on where you want to get to.
    -- Lewis Carroll "Alice's Adventures in Wonderland"

    From: Daniel Ritz <daniel.ritz@gmx.ch>

    Resume doesn't seem to work without.

    Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
    Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    ---

    drivers/pcmcia/yenta_socket.c | 9 +++++++++
    1 files changed, 9 insertions(+)

    diff -puN drivers/pcmcia/yenta_socket.c~yenta-free_irq-on-suspend drivers/pcmcia/yenta_socket.c
    --- devel/drivers/pcmcia/yenta_socket.c~yenta-free_irq-on-suspend 2005-07-28 01:05:52.000000000 -0700
    +++ devel-akpm/drivers/pcmcia/yenta_socket.c 2005-07-28 01:05:52.000000000 -0700
    @@ -1107,6 +1107,8 @@ static int yenta_dev_suspend (struct pci
    pci_read_config_dword(dev, 17*4, &socket->saved_state[1]);
    pci_disable_device(dev);

    + free_irq(dev->irq, socket);
    +
    /*
    * Some laptops (IBM T22) do not like us putting the Cardbus
    * bridge into D3. At a guess, some other laptop will
    @@ -1132,6 +1134,13 @@ static int yenta_dev_resume (struct pci_
    pci_enable_device(dev);
    pci_set_master(dev);

    + if (socket->cb_irq)
    + if (request_irq(socket->cb_irq, yenta_interrupt,
    + SA_SHIRQ, "yenta", socket)) {
    + printk(KERN_WARNING "Yenta: request_irq() failed on resume!\n");
    + socket->cb_irq = 0;
    + }
    +
    if (socket->type && socket->type->restore_state)
    socket->type->restore_state(socket);
    }
    _
    \
     
     \ /
      Last update: 2005-09-11 19:06    [W:0.055 / U:29.972 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site