diff options
Diffstat (limited to 'drivers/media/usb/au0828')
| -rw-r--r-- | drivers/media/usb/au0828/au0828-core.c | 11 | ||||
| -rw-r--r-- | drivers/media/usb/au0828/au0828-dvb.c | 4 |
2 files changed, 5 insertions, 10 deletions
diff --git a/drivers/media/usb/au0828/au0828-core.c b/drivers/media/usb/au0828/au0828-core.c index 877e85a451cb..b3a09d3ac7d2 100644 --- a/drivers/media/usb/au0828/au0828-core.c +++ b/drivers/media/usb/au0828/au0828-core.c @@ -211,7 +211,7 @@ static int au0828_media_device_init(struct au0828_dev *dev, static void au0828_media_graph_notify(struct media_entity *new, void *notify_data) { - struct au0828_dev *dev = (struct au0828_dev *) notify_data; + struct au0828_dev *dev = notify_data; int ret; struct media_entity *entity, *mixer = NULL, *decoder = NULL; @@ -627,14 +627,9 @@ static int au0828_media_device_register(struct au0828_dev *dev, /* register entity_notify callback */ dev->entity_notify.notify_data = (void *) dev; dev->entity_notify.notify = (void *) au0828_media_graph_notify; - ret = media_device_register_entity_notify(dev->media_dev, + media_device_register_entity_notify(dev->media_dev, &dev->entity_notify); - if (ret) { - dev_err(&udev->dev, - "Media Device register entity_notify Error: %d\n", - ret); - return ret; - } + /* set enable_source */ mutex_lock(&dev->media_dev->graph_mutex); dev->media_dev->source_priv = (void *) dev; diff --git a/drivers/media/usb/au0828/au0828-dvb.c b/drivers/media/usb/au0828/au0828-dvb.c index 2a8691a0d7fa..09f9948c6f8e 100644 --- a/drivers/media/usb/au0828/au0828-dvb.c +++ b/drivers/media/usb/au0828/au0828-dvb.c @@ -273,7 +273,7 @@ static void au0828_stop_transport(struct au0828_dev *dev, int full_stop) static int au0828_dvb_start_feed(struct dvb_demux_feed *feed) { struct dvb_demux *demux = feed->demux; - struct au0828_dev *dev = (struct au0828_dev *) demux->priv; + struct au0828_dev *dev = demux->priv; struct au0828_dvb *dvb = &dev->dvb; int ret = 0; @@ -305,7 +305,7 @@ static int au0828_dvb_start_feed(struct dvb_demux_feed *feed) static int au0828_dvb_stop_feed(struct dvb_demux_feed *feed) { struct dvb_demux *demux = feed->demux; - struct au0828_dev *dev = (struct au0828_dev *) demux->priv; + struct au0828_dev *dev = demux->priv; struct au0828_dvb *dvb = &dev->dvb; int ret = 0; |