lkml.org 
[lkml]   [2005]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: FIx u32 vs. pm_message_t confusion in firewire
    On Tue, Feb 15, 2005 at 01:47:59AM +0100, Pavel Machek wrote:
    > Hi!
    >
    > This should fix u32 vs. pm_message_t confusion in firewire. No code
    > changes. Please apply,
    > Pavel

    Applied to 1394 SVN and development bitkeeper. I will send this
    upstream sometime after 2.6.11.

    Thanks,
    Jody

    > Signed-off-by: Pavel Machek <pavel@suse.cz>
    >
    > --- clean-mm/drivers/ieee1394/nodemgr.c 2005-02-15 00:46:40.000000000 +0100
    > +++ linux-mm/drivers/ieee1394/nodemgr.c 2005-02-15 01:04:10.000000000 +0100
    > @@ -1284,7 +1284,7 @@
    >
    > if (ud->device.driver &&
    > (!ud->device.driver->suspend ||
    > - ud->device.driver->suspend(&ud->device, 0, 0)))
    > + ud->device.driver->suspend(&ud->device, PMSG_SUSPEND, 0)))
    > device_release_driver(&ud->device);
    > }
    > up_write(&ne->device.bus->subsys.rwsem);
    > --- clean-mm/drivers/ieee1394/ohci1394.c 2005-02-15 00:46:40.000000000 +0100
    > +++ linux-mm/drivers/ieee1394/ohci1394.c 2005-02-15 01:04:10.000000000 +0100
    > @@ -3546,7 +3546,7 @@
    > }
    >
    >
    > -static int ohci1394_pci_suspend (struct pci_dev *pdev, u32 state)
    > +static int ohci1394_pci_suspend (struct pci_dev *pdev, pm_message_t state)
    > {
    > #ifdef CONFIG_PMAC_PBOOK
    > {
    >
    >
    > --
    > People were complaining that M$ turns users into beta-testers...
    > ...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!

    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-03-22 14:10    [W:0.022 / U:0.220 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site