diff options
| author | Deepak Saxena <dsaxena@laptop.org> | 2008-07-30 10:30:53 -0700 |
|---|---|---|
| committer | Deepak Saxena <dsaxena@laptop.org> | 2008-07-30 10:30:53 -0700 |
| commit | 85e8ce3752b87a20b329356e624c37a253586622 (patch) | |
| tree | da41eefe2871776be0586b33e013f30251a76765 /drivers/char | |
| parent | a3851e734bcee1b2342652057d084f0653e9d586 (diff) | |
| parent | a37912658a4844fa6a1bbf13873e394e15af47a9 (diff) | |
| download | lwn-85e8ce3752b87a20b329356e624c37a253586622.tar.gz lwn-85e8ce3752b87a20b329356e624c37a253586622.zip | |
Merge commit 'v2.6.25.13' into olpc-testing
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/pcmcia/ipwireless/hardware.c | 4 | ||||
| -rw-r--r-- | drivers/char/rtc.c | 3 | ||||
| -rw-r--r-- | drivers/char/tpm/tpm_tis.c | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/drivers/char/pcmcia/ipwireless/hardware.c b/drivers/char/pcmcia/ipwireless/hardware.c index d3538668a8ee..48c20402bc2b 100644 --- a/drivers/char/pcmcia/ipwireless/hardware.c +++ b/drivers/char/pcmcia/ipwireless/hardware.c @@ -616,8 +616,10 @@ static struct ipw_rx_packet *pool_allocate(struct ipw_hardware *hw, packet = kmalloc(sizeof(struct ipw_rx_packet) + old_packet->length + minimum_free_space, GFP_ATOMIC); - if (!packet) + if (!packet) { + kfree(old_packet); return NULL; + } memcpy(packet, old_packet, sizeof(struct ipw_rx_packet) + old_packet->length); diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c index 5c3142b6f1fc..81ecec0c65b5 100644 --- a/drivers/char/rtc.c +++ b/drivers/char/rtc.c @@ -677,12 +677,13 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel) if (arg != (1<<tmp)) return -EINVAL; + rtc_freq = arg; + spin_lock_irqsave(&rtc_lock, flags); if (hpet_set_periodic_freq(arg)) { spin_unlock_irqrestore(&rtc_lock, flags); return 0; } - rtc_freq = arg; val = CMOS_READ(RTC_FREQ_SELECT) & 0xf0; val |= (16 - tmp); diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index 81503d94fecc..676564966762 100644 --- a/drivers/char/tpm/tpm_tis.c +++ b/drivers/char/tpm/tpm_tis.c @@ -623,6 +623,7 @@ static struct pnp_device_id tpm_pnp_tbl[] __devinitdata = { {"IFX0102", 0}, /* Infineon */ {"BCM0101", 0}, /* Broadcom */ {"NSC1200", 0}, /* National */ + {"ICO0102", 0}, /* Intel */ /* Add new here */ {"", 0}, /* User Specified */ {"", 0} /* Terminator */ |