diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-04 18:25:30 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-08 11:53:15 +0200 |
| commit | fde04ab95d43e55959f12b92711b0ca4fed40637 (patch) | |
| tree | ba274fcfc76b75d08907fa73b10b0a7a5a328881 /drivers/media/usb/ttusb-budget | |
| parent | [media] exynos4-is: Ensure proper media pipeline state on device close (diff) | |
| download | linux-fde04ab95d43e55959f12b92711b0ca4fed40637.tar.xz linux-fde04ab95d43e55959f12b92711b0ca4fed40637.zip | |
[media] demux.h: Remove duplicated enum
"enum dmx_ts_pes" and "typedef enum dmx_pes_type_t" are just the
same enum declared twice, since Kernel (2.6.12). There's no reason
to duplicate it there, and sparse complains about that:
drivers/media/dvb-core/dmxdev.c:600:55: warning: mixing different enum types
So, remove the internal define, keeping just the external one.
Internally, use only "enum dmx_ts_pes", as it is too late to drop
dmx_pes_type_t from the userspace API.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb/ttusb-budget')
| -rw-r--r-- | drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c index e40718552850..21b9049c7b3f 100644 --- a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c +++ b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c @@ -930,11 +930,11 @@ static int ttusb_start_feed(struct dvb_demux_feed *dvbdmxfeed) if (dvbdmxfeed->type == DMX_TYPE_TS) { switch (dvbdmxfeed->pes_type) { - case DMX_TS_PES_VIDEO: - case DMX_TS_PES_AUDIO: - case DMX_TS_PES_TELETEXT: - case DMX_TS_PES_PCR: - case DMX_TS_PES_OTHER: + case DMX_PES_VIDEO: + case DMX_PES_AUDIO: + case DMX_PES_TELETEXT: + case DMX_PES_PCR: + case DMX_PES_OTHER: break; default: return -EINVAL; |