diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-30 18:07:09 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-30 18:07:09 -0400 |
| commit | 08fa16b6b75005c120b59d00ae42a0b7cc68db45 (patch) | |
| tree | c5f22412467f72dd0c7291bbb958a9485e894f02 /drivers/media/dvb/firewire/firedtv-1394.c | |
| parent | 1796b983cc4cbbed5e9e478b03591609a2c21987 (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into next
Diffstat (limited to 'drivers/media/dvb/firewire/firedtv-1394.c')
| -rw-r--r-- | drivers/media/dvb/firewire/firedtv-1394.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/firewire/firedtv-1394.c b/drivers/media/dvb/firewire/firedtv-1394.c index 26333b4f4d3..b34ca7afb0e 100644 --- a/drivers/media/dvb/firewire/firedtv-1394.c +++ b/drivers/media/dvb/firewire/firedtv-1394.c | |||
| @@ -58,7 +58,7 @@ static void rawiso_activity_cb(struct hpsb_iso *iso) | |||
| 58 | num = hpsb_iso_n_ready(iso); | 58 | num = hpsb_iso_n_ready(iso); |
| 59 | 59 | ||
| 60 | if (!fdtv) { | 60 | if (!fdtv) { |
| 61 | dev_err(fdtv->device, "received at unknown iso channel\n"); | 61 | pr_err("received at unknown iso channel\n"); |
| 62 | goto out; | 62 | goto out; |
| 63 | } | 63 | } |
| 64 | 64 | ||