diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
| commit | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (patch) | |
| tree | 57425aa83c8bed5b41af7e3408024fe1f2fdded9 /drivers/media/dvb/cinergyT2/cinergyT2.c | |
| parent | 022e7a12b6aa11a11de4d708fe8606c9a6734b37 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/media/dvb/cinergyT2/cinergyT2.c')
| -rw-r--r-- | drivers/media/dvb/cinergyT2/cinergyT2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c index 001c71b6be61..410fa6d620ff 100644 --- a/drivers/media/dvb/cinergyT2/cinergyT2.c +++ b/drivers/media/dvb/cinergyT2/cinergyT2.c | |||
| @@ -981,7 +981,7 @@ static int cinergyt2_suspend (struct usb_interface *intf, pm_message_t state) | |||
| 981 | if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->sem)) | 981 | if (cinergyt2->disconnect_pending || mutex_lock_interruptible(&cinergyt2->sem)) |
| 982 | return -ERESTARTSYS; | 982 | return -ERESTARTSYS; |
| 983 | 983 | ||
| 984 | if (state.event > PM_EVENT_ON) { | 984 | if (1) { |
| 985 | struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf); | 985 | struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf); |
| 986 | 986 | ||
| 987 | cinergyt2_suspend_rc(cinergyt2); | 987 | cinergyt2_suspend_rc(cinergyt2); |