← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to drivers/rtc/rtc-coh901331.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno, Martin Michlmayr
  • Date: 2011-04-06 13:53:30 UTC
  • mfrom: (43.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110406135330-wjufxhd0tvn3zx4z
Tags: 2.6.38-3
http://bugs.debian.org/620124
http://bugs.debian.org/620284
http://bugs.debian.org/620204
[ Ben Hutchings ]
* [ppc64] Add to linux-tools package architectures (Closes: #620124)
* [amd64] Save cr4 to mmu_cr4_features at boot time (Closes: #620284)
* appletalk: Fix bugs introduced when removing use of BKL
* ALSA: Fix yet another race in disconnection
* cciss: Fix lost command issue
* ath9k: Fix kernel panic in AR2427
* ses: Avoid kernel panic when lun 0 is not mapped
* PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

[ Aurelien Jarno ]
* rtlwifi: fix build when PCI is not enabled.

[ Martin Michlmayr ]
* rtlwifi: Eliminate udelay calls with too large values (Closes: #620204)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/rtc/rtc-coh901331.c
14
14
#include <linux/pm.h>
15
15
#include <linux/platform_device.h>
16
16
#include <linux/io.h>
 
17
#include <linux/slab.h>
17
18
 
18
19
/*
19
20
 * Registers in the COH 901 331
271
272
{
272
273
        struct coh901331_port *rtap = dev_get_drvdata(&pdev->dev);
273
274
 
274
 
        if (device_may_wakeup(&pdev->dev))
 
275
        if (device_may_wakeup(&pdev->dev)) {
275
276
                disable_irq_wake(rtap->irq);
276
 
        else
 
277
        } else {
277
278
                clk_enable(rtap->clk);
278
279
                writel(rtap->irqmaskstore, rtap->virtbase + COH901331_IRQ_MASK);
279
280
                clk_disable(rtap->clk);
 
281
        }
280
282
        return 0;
281
283
}
282
284
#else