Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 76392
b: refs/heads/master
c: ad1ce84
h: refs/heads/master
v: v3
  • Loading branch information
Adrian Bunk authored and Mauro Carvalho Chehab committed Jan 25, 2008
1 parent 37107aa commit 585ecdc
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 18 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: 67b24c78839067729b660116ba394568cd136130
refs/heads/master: ad1ce84047a39aec735ef0d5efe29b845bea3262
16 changes: 0 additions & 16 deletions trunk/drivers/media/dvb/dvb-usb/gp8psk.c
Original file line number Diff line number Diff line change
Expand Up @@ -171,22 +171,6 @@ static int gp8psk_power_ctrl(struct dvb_usb_device *d, int onoff)
return 0;
}

int gp8psk_bcm4500_reload(struct dvb_usb_device *d)
{
u8 buf;
int gp_product_id = le16_to_cpu(d->udev->descriptor.idProduct);
/* Turn off 8psk power */
if (gp8psk_usb_in_op(d, BOOT_8PSK, 0, 0, &buf, 1))
return -EINVAL;
/* Turn On 8psk power */
if (gp8psk_usb_in_op(d, BOOT_8PSK, 1, 0, &buf, 1))
return -EINVAL;
/* load BCM4500 firmware */
if (gp_product_id == USB_PID_GENPIX_8PSK_REV_1_WARM)
if (gp8psk_load_bcm4500fw(d))
return EINVAL;
return 0;
}

static int gp8psk_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
{
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/media/dvb/dvb-usb/gp8psk.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,5 @@ extern struct dvb_frontend * gp8psk_fe_attach(struct dvb_usb_device *d);
extern int gp8psk_usb_in_op(struct dvb_usb_device *d, u8 req, u16 value, u16 index, u8 *b, int blen);
extern int gp8psk_usb_out_op(struct dvb_usb_device *d, u8 req, u16 value,
u16 index, u8 *b, int blen);
extern int gp8psk_bcm4500_reload(struct dvb_usb_device *d);

#endif

0 comments on commit 585ecdc

Please sign in to comment.