mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
media: ddbridge: improve ddb_ports_attach() failure handling
As all error handling improved quite a bit, don't stop attaching frontends if one of them failed, since - if other tuner modules are connected to the PCIe bridge - other hardware may just work, so don't break on a single port failure, but rather initialise as much as possible. Ie. if there are issues with a C2T2-equipped PCIe bridge card which has additional DuoFlex modules connected and the bridge generally works, the DuoFlex tuners can still work fine. If all ports failed to initialise where connected hardware was detected on at first, return -ENODEV though to cause this PCI device to fail and free all allocated resources. In any case, leave a kernel log warning (or error, even) if things went wrong. Signed-off-by: Daniel Scheller <d.scheller@gmx.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
parent
c0e10260cc
commit
ae49432810
1 changed files with 23 additions and 3 deletions
|
@ -1964,7 +1964,7 @@ static int ddb_port_attach(struct ddb_port *port)
|
|||
|
||||
int ddb_ports_attach(struct ddb *dev)
|
||||
{
|
||||
int i, ret = 0;
|
||||
int i, numports, err_ports = 0, ret = 0;
|
||||
struct ddb_port *port;
|
||||
|
||||
if (dev->port_num) {
|
||||
|
@ -1974,11 +1974,31 @@ int ddb_ports_attach(struct ddb *dev)
|
|||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
numports = dev->port_num;
|
||||
|
||||
for (i = 0; i < dev->port_num; i++) {
|
||||
port = &dev->port[i];
|
||||
ret = ddb_port_attach(port);
|
||||
if (port->class != DDB_PORT_NONE) {
|
||||
ret = ddb_port_attach(port);
|
||||
if (ret)
|
||||
err_ports++;
|
||||
} else {
|
||||
numports--;
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
|
||||
if (err_ports) {
|
||||
if (err_ports == numports) {
|
||||
dev_err(dev->dev, "All connected ports failed to initialise!\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
dev_warn(dev->dev, "%d of %d connected ports failed to initialise!\n",
|
||||
err_ports, numports);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void ddb_ports_detach(struct ddb *dev)
|
||||
|
|
Loading…
Reference in a new issue