Skip to content

Commit

Permalink
[media] af9035: enhancement for unknown tuner ID handling
Browse files Browse the repository at this point in the history
* do not attach frontend when tuner is not supported
* fix unkown tuner ID log write format
* add prefix for dvb-usb log writings

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Antti Palosaari authored and Mauro Carvalho Chehab committed Apr 9, 2012
1 parent 7f882c2 commit 5a9abae
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
10 changes: 7 additions & 3 deletions drivers/media/dvb/dvb-usb/af9035.c
Original file line number Diff line number Diff line change
Expand Up @@ -489,10 +489,9 @@ static int af9035_read_mac_address(struct dvb_usb_device *d, u8 mac[6])
af9035_af9033_config[i].spec_inv = 1;
break;
default:
warn("tuner ID=%20x not supported, please report!",
af9035_config.hw_not_supported = true;
warn("tuner ID=%02x not supported, please report!",
tmp);
ret = -ENODEV;
goto err;
};

/* tuner IF frequency */
Expand Down Expand Up @@ -535,6 +534,11 @@ static int af9035_frontend_attach(struct dvb_usb_adapter *adap)
{
int ret;

if (af9035_config.hw_not_supported) {
ret = -ENODEV;
goto err;
}

if (adap->id == 0) {
ret = af9035_wr_reg(adap->dev, 0x00417f,
af9035_af9033_config[1].i2c_addr);
Expand Down
4 changes: 4 additions & 0 deletions drivers/media/dvb/dvb-usb/af9035.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
#ifndef AF9035_H
#define AF9035_H

/* prefix for dvb-usb log writings */
#define DVB_USB_LOG_PREFIX "af9035"

#include "dvb-usb.h"

struct reg_val {
Expand All @@ -46,6 +49,7 @@ struct usb_req {

struct config {
bool dual_mode;
bool hw_not_supported;
};

struct fw_segment {
Expand Down

0 comments on commit 5a9abae

Please sign in to comment.