aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorLuis de Bethencourt <luis@debethencourt.com>2015-02-04 08:42:12 -0500
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-04-08 06:39:24 -0400
commite68c2fe64c52c33e55f2d259d41a956a9e1f2a83 (patch)
treeb13faa1a5453f93d57511efeb1786d9753984163 /drivers/media
parent5164d6aac0ed1b711a7b29bb556844e40f422ec6 (diff)
[media] dvb-usb: fix spaces after commas
Fixing a few checkpatch errors of type: space required after that ',' Signed-off-by: Luis de Bethencourt <luis.bg@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/usb/dvb-usb/dvb-usb-dvb.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/media/usb/dvb-usb/dvb-usb-dvb.c b/drivers/media/usb/dvb-usb/dvb-usb-dvb.c
index 7b7b834777b7..8a260c854653 100644
--- a/drivers/media/usb/dvb-usb/dvb-usb-dvb.c
+++ b/drivers/media/usb/dvb-usb/dvb-usb-dvb.c
@@ -84,14 +84,15 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff)
84 84
85static int dvb_usb_start_feed(struct dvb_demux_feed *dvbdmxfeed) 85static int dvb_usb_start_feed(struct dvb_demux_feed *dvbdmxfeed)
86{ 86{
87 deb_ts("start pid: 0x%04x, feedtype: %d\n", dvbdmxfeed->pid,dvbdmxfeed->type); 87 deb_ts("start pid: 0x%04x, feedtype: %d\n", dvbdmxfeed->pid,
88 return dvb_usb_ctrl_feed(dvbdmxfeed,1); 88 dvbdmxfeed->type);
89 return dvb_usb_ctrl_feed(dvbdmxfeed, 1);
89} 90}
90 91
91static int dvb_usb_stop_feed(struct dvb_demux_feed *dvbdmxfeed) 92static int dvb_usb_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
92{ 93{
93 deb_ts("stop pid: 0x%04x, feedtype: %d\n", dvbdmxfeed->pid, dvbdmxfeed->type); 94 deb_ts("stop pid: 0x%04x, feedtype: %d\n", dvbdmxfeed->pid, dvbdmxfeed->type);
94 return dvb_usb_ctrl_feed(dvbdmxfeed,0); 95 return dvb_usb_ctrl_feed(dvbdmxfeed, 0);
95} 96}
96 97
97static void dvb_usb_media_device_register(struct dvb_usb_adapter *adap) 98static void dvb_usb_media_device_register(struct dvb_usb_adapter *adap)
@@ -156,8 +157,8 @@ int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap, short *adapter_nums)
156 dvb_usb_media_device_register(adap); 157 dvb_usb_media_device_register(adap);
157 158
158 if (adap->dev->props.read_mac_address) { 159 if (adap->dev->props.read_mac_address) {
159 if (adap->dev->props.read_mac_address(adap->dev,adap->dvb_adap.proposed_mac) == 0) 160 if (adap->dev->props.read_mac_address(adap->dev, adap->dvb_adap.proposed_mac) == 0)
160 info("MAC address: %pM",adap->dvb_adap.proposed_mac); 161 info("MAC address: %pM", adap->dvb_adap.proposed_mac);
161 else 162 else
162 err("MAC address reading failed."); 163 err("MAC address reading failed.");
163 } 164 }
@@ -176,7 +177,7 @@ int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap, short *adapter_nums)
176 adap->demux.stop_feed = dvb_usb_stop_feed; 177 adap->demux.stop_feed = dvb_usb_stop_feed;
177 adap->demux.write_to_decoder = NULL; 178 adap->demux.write_to_decoder = NULL;
178 if ((ret = dvb_dmx_init(&adap->demux)) < 0) { 179 if ((ret = dvb_dmx_init(&adap->demux)) < 0) {
179 err("dvb_dmx_init failed: error %d",ret); 180 err("dvb_dmx_init failed: error %d", ret);
180 goto err_dmx; 181 goto err_dmx;
181 } 182 }
182 183
@@ -184,13 +185,13 @@ int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap, short *adapter_nums)
184 adap->dmxdev.demux = &adap->demux.dmx; 185 adap->dmxdev.demux = &adap->demux.dmx;
185 adap->dmxdev.capabilities = 0; 186 adap->dmxdev.capabilities = 0;
186 if ((ret = dvb_dmxdev_init(&adap->dmxdev, &adap->dvb_adap)) < 0) { 187 if ((ret = dvb_dmxdev_init(&adap->dmxdev, &adap->dvb_adap)) < 0) {
187 err("dvb_dmxdev_init failed: error %d",ret); 188 err("dvb_dmxdev_init failed: error %d", ret);
188 goto err_dmx_dev; 189 goto err_dmx_dev;
189 } 190 }
190 191
191 if ((ret = dvb_net_init(&adap->dvb_adap, &adap->dvb_net, 192 if ((ret = dvb_net_init(&adap->dvb_adap, &adap->dvb_net,
192 &adap->demux.dmx)) < 0) { 193 &adap->demux.dmx)) < 0) {
193 err("dvb_net_init failed: error %d",ret); 194 err("dvb_net_init failed: error %d", ret);
194 goto err_net_init; 195 goto err_net_init;
195 } 196 }
196 197