Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 219293
b: refs/heads/master
c: 9a3ecc7
h: refs/heads/master
i:
  219291: f7f1eb3
v: v3
  • Loading branch information
Antti Palosaari authored and Mauro Carvalho Chehab committed Oct 21, 2010
1 parent 5ef8f0a commit 1b80570
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8ccdf1ae9d223d144919788c221c1c559fa56588
refs/heads/master: 9a3ecc738258f22b7c09050ca219b37c9eaae6d5
12 changes: 7 additions & 5 deletions trunk/drivers/media/dvb/dvb-usb/af9015.c
Original file line number Diff line number Diff line change
Expand Up @@ -969,8 +969,10 @@ static int af9015_read_config(struct usb_device *udev)
content :-( Override some wrong values here. Ditto for the
AVerTV Red HD+ (A850T) device. */
if (le16_to_cpu(udev->descriptor.idVendor) == USB_VID_AVERMEDIA &&
((le16_to_cpu(udev->descriptor.idProduct) == USB_PID_AVERMEDIA_A850) ||
(le16_to_cpu(udev->descriptor.idProduct) == USB_PID_AVERMEDIA_A850T))) {
((le16_to_cpu(udev->descriptor.idProduct) ==
USB_PID_AVERMEDIA_A850) ||
(le16_to_cpu(udev->descriptor.idProduct) ==
USB_PID_AVERMEDIA_A850T))) {
deb_info("%s: AverMedia A850: overriding config\n", __func__);
/* disable dual mode */
af9015_config.dual_mode = 0;
Expand Down Expand Up @@ -1203,7 +1205,7 @@ static int af9015_tuner_attach(struct dvb_usb_adapter *adap)
struct af9015_state *state = adap->dev->priv;
struct i2c_adapter *i2c_adap;
int ret;
deb_info("%s: \n", __func__);
deb_info("%s:\n", __func__);

/* select I2C adapter */
if (adap->id == 0)
Expand Down Expand Up @@ -1690,7 +1692,7 @@ static int af9015_usb_probe(struct usb_interface *intf,
static void af9015_i2c_exit(struct dvb_usb_device *d)
{
struct af9015_state *state = d->priv;
deb_info("%s: \n", __func__);
deb_info("%s:\n", __func__);

/* remove 2nd I2C adapter */
if (d->state & DVB_USB_STATE_I2C)
Expand All @@ -1700,7 +1702,7 @@ static void af9015_i2c_exit(struct dvb_usb_device *d)
static void af9015_usb_device_exit(struct usb_interface *intf)
{
struct dvb_usb_device *d = usb_get_intfdata(intf);
deb_info("%s: \n", __func__);
deb_info("%s:\n", __func__);

/* remove 2nd I2C adapter */
if (d != NULL && d->desc != NULL)
Expand Down

0 comments on commit 1b80570

Please sign in to comment.