Ubuntu 7.10 won't suspend on a Sony SZ

I just upgraded my Sony SZ laptop from Ubuntu 7.04 to version 7.10. Now suspend / hibernate won't work. The bummer is that I had it working in 7.04. It wouldn't work with the default suspend / hibernate functionality in Gnome, but I downloaded the uswsusp package and was able to use both s2ram and s2disk to suspend to RAM and Disk respectively.

Here is what happens.. I try the default suspend functions in Gnome and it blanks the screen for a second and then asks for my password, afterwards it says there was a problem suspending. s2disk no longer works - it goes to black terminal screen and says something about starting to create the snapshot and then it just sits there (hung system). For some reason they have removed the s2ram utility from the uswsusp package in Ubuntu 7.10 so I can't test that.

The suspend functionality in the kernel doesn't work either (echo platform > /sys/power/disk; echo disk > /sys/power/state).

Now, if I boot my machine with one of the older kernels (prior to ubuntu 7.10) then s2disk works. I guess I could live with that, but it is rather annoying that they removed s2ram so I can't suspend to ram when I want to. The s2both utility (which is still included) claims that it will save a snapshot to disk, but will do a suspend to RAM instead of a full power down. Everything seems to go fine, except my machine powers all the way down just like a full suspend to disk. The system resumes all right, but for some reason this isn't a suspend to RAM like it is supposed to be (which boots up much faster).

I did find that if I downloaded and compiled kernel 2.6.23.1 that the suspend/hibernate functionality in the Linux kernel works like a charm (yay!). Unfortunately, I'm having trouble getting this new kernel compiled with the Intel 4695 wireless drivers that I need for my laptop (boo!).

Here is my system information while booting from the default Ubuntu 7.10 kernel:
#uname -a
Linux ubuntu 2.6.22-14-generic #1 SMP Sun Oct 14 23:05:12 GMT 2007 i686 GNU/Linux

#lspci
00:00.0 Host bridge: Intel Corporation Mobile 945GM/PM/GMS, 943/940GML and 945GT Express Memory Controller Hub (rev 03)
00:02.0 VGA compatible controller: Intel Corporation Mobile 945GM/GMS, 943/940GML Express Integrated Graphics Controller (rev 03)
00:02.1 Display controller: Intel Corporation Mobile 945GM/GMS/GME, 943/940GML Express Integrated Graphics Controller (rev 03)
00:1b.0 Audio device: Intel Corporation 82801G (ICH7 Family) High Definition Audio Controller (rev 02)
00:1c.0 PCI bridge: Intel Corporation 82801G (ICH7 Family) PCI Express Port 1 (rev 02)
00:1c.1 PCI bridge: Intel Corporation 82801G (ICH7 Family) PCI Express Port 2 (rev 02)
00:1c.2 PCI bridge: Intel Corporation 82801G (ICH7 Family) PCI Express Port 3 (rev 02)
00:1c.3 PCI bridge: Intel Corporation 82801G (ICH7 Family) PCI Express Port 4 (rev 02)
00:1d.0 USB Controller: Intel Corporation 82801G (ICH7 Family) USB UHCI Controller #1 (rev 02)
00:1d.1 USB Controller: Intel Corporation 82801G (ICH7 Family) USB UHCI Controller #2 (rev 02)
00:1d.2 USB Controller: Intel Corporation 82801G (ICH7 Family) USB UHCI Controller #3 (rev 02)
00:1d.3 USB Controller: Intel Corporation 82801G (ICH7 Family) USB UHCI Controller #4 (rev 02)
00:1d.7 USB Controller: Intel Corporation 82801G (ICH7 Family) USB2 EHCI Controller (rev 02)
00:1e.0 PCI bridge: Intel Corporation 82801 Mobile PCI Bridge (rev e2)
00:1f.0 ISA bridge: Intel Corporation 82801GBM (ICH7-M) LPC Interface Bridge (rev 02)
00:1f.1 IDE interface: Intel Corporation 82801G (ICH7 Family) IDE Controller (rev 02)
00:1f.2 IDE interface: Intel Corporation 82801GBM/GHM (ICH7 Family) SATA IDE Controller (rev 02)
00:1f.3 SMBus: Intel Corporation 82801G (ICH7 Family) SMBus Controller (rev 02)
06:00.0 Network controller: Intel Corporation PRO/Wireless 3945ABG Network Connection (rev 02)
07:00.0 Ethernet controller: Marvell Technology Group Ltd. 88E8036 PCI-E Fast Ethernet Controller (rev 16)
09:04.0 CardBus bridge: Texas Instruments PCIxx12 Cardbus Controller
09:04.1 FireWire (IEEE 1394): Texas Instruments PCIxx12 OHCI Compliant IEEE 1394 Host Controller
09:04.2 Mass storage controller: Texas Instruments 5-in-1 Multimedia Card Reader (SD/MMC/MS/MS PRO/xD)

#lsusb
Bus 005 Device 002: ID 054c:0281 Sony Corp.
Bus 005 Device 004: ID 05ca:1835 Ricoh Co., Ltd
Bus 005 Device 001: ID 0000:0000
Bus 003 Device 002: ID 0483:2016 SGS Thomson Microelectronics Fingerprint Reader
Bus 003 Device 001: ID 0000:0000
Bus 001 Device 001: ID 0000:0000
Bus 002 Device 001: ID 0000:0000
Bus 004 Device 002: ID 044e:300d Alps Electric Co., Ltd
Bus 004 Device 001: ID 0000:0000

I would greatly appreciate any suggestions.

Thanks!