tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[media] dvb-usb: fix indentation of a for loop
Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
authored by
Antonio Ospite
and committed by
Mauro Carvalho Chehab
a214c551
87739868
+30
-30
+30
-30
drivers/media/usb/dvb-usb/dvb-usb-init.c
+30
-30
drivers/media/usb/dvb-usb/dvb-usb-init.c
···
38
38
39
39
memcpy(&adap->props, &d->props.adapter[n], sizeof(struct dvb_usb_adapter_properties));
40
40
41
-
for (o = 0; o < adap->props.num_frontends; o++) {
42
-
struct dvb_usb_adapter_fe_properties *props = &adap->props.fe[o];
43
-
/* speed - when running at FULL speed we need a HW PID filter */
44
-
if (d->udev->speed == USB_SPEED_FULL && !(props->caps & DVB_USB_ADAP_HAS_PID_FILTER)) {
45
-
err("This USB2.0 device cannot be run on a USB1.1 port. (it lacks a hardware PID filter)");
46
-
return -ENODEV;
47
-
}
41
+
for (o = 0; o < adap->props.num_frontends; o++) {
42
+
struct dvb_usb_adapter_fe_properties *props = &adap->props.fe[o];
43
+
/* speed - when running at FULL speed we need a HW PID filter */
44
+
if (d->udev->speed == USB_SPEED_FULL && !(props->caps & DVB_USB_ADAP_HAS_PID_FILTER)) {
45
+
err("This USB2.0 device cannot be run on a USB1.1 port. (it lacks a hardware PID filter)");
46
+
return -ENODEV;
47
+
}
48
48
49
-
if ((d->udev->speed == USB_SPEED_FULL && props->caps & DVB_USB_ADAP_HAS_PID_FILTER) ||
50
-
(props->caps & DVB_USB_ADAP_NEED_PID_FILTERING)) {
51
-
info("will use the device's hardware PID filter (table count: %d).", props->pid_filter_count);
52
-
adap->fe_adap[o].pid_filtering = 1;
53
-
adap->fe_adap[o].max_feed_count = props->pid_filter_count;
54
-
} else {
55
-
info("will pass the complete MPEG2 transport stream to the software demuxer.");
56
-
adap->fe_adap[o].pid_filtering = 0;
57
-
adap->fe_adap[o].max_feed_count = 255;
58
-
}
49
+
if ((d->udev->speed == USB_SPEED_FULL && props->caps & DVB_USB_ADAP_HAS_PID_FILTER) ||
50
+
(props->caps & DVB_USB_ADAP_NEED_PID_FILTERING)) {
51
+
info("will use the device's hardware PID filter (table count: %d).", props->pid_filter_count);
52
+
adap->fe_adap[o].pid_filtering = 1;
53
+
adap->fe_adap[o].max_feed_count = props->pid_filter_count;
54
+
} else {
55
+
info("will pass the complete MPEG2 transport stream to the software demuxer.");
56
+
adap->fe_adap[o].pid_filtering = 0;
57
+
adap->fe_adap[o].max_feed_count = 255;
58
+
}
59
59
60
-
if (!adap->fe_adap[o].pid_filtering &&
61
-
dvb_usb_force_pid_filter_usage &&
62
-
props->caps & DVB_USB_ADAP_HAS_PID_FILTER) {
63
-
info("pid filter enabled by module option.");
64
-
adap->fe_adap[o].pid_filtering = 1;
65
-
adap->fe_adap[o].max_feed_count = props->pid_filter_count;
66
-
}
60
+
if (!adap->fe_adap[o].pid_filtering &&
61
+
dvb_usb_force_pid_filter_usage &&
62
+
props->caps & DVB_USB_ADAP_HAS_PID_FILTER) {
63
+
info("pid filter enabled by module option.");
64
+
adap->fe_adap[o].pid_filtering = 1;
65
+
adap->fe_adap[o].max_feed_count = props->pid_filter_count;
66
+
}
67
67
68
-
if (props->size_of_priv > 0) {
69
-
adap->fe_adap[o].priv = kzalloc(props->size_of_priv, GFP_KERNEL);
70
-
if (adap->fe_adap[o].priv == NULL) {
71
-
err("no memory for priv for adapter %d fe %d.", n, o);
72
-
return -ENOMEM;
68
+
if (props->size_of_priv > 0) {
69
+
adap->fe_adap[o].priv = kzalloc(props->size_of_priv, GFP_KERNEL);
70
+
if (adap->fe_adap[o].priv == NULL) {
71
+
err("no memory for priv for adapter %d fe %d.", n, o);
72
+
return -ENOMEM;
73
+
}
73
74
}
74
75
}
75
-
}
76
76
77
77
if (adap->props.size_of_priv > 0) {
78
78
adap->priv = kzalloc(adap->props.size_of_priv, GFP_KERNEL);