Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 271869
b: refs/heads/master
c: 810fda9
h: refs/heads/master
i:
  271867: 6e1f7b6
v: v3
  • Loading branch information
tvboxspy authored and Mauro Carvalho Chehab committed Sep 21, 2011
1 parent 6b5758f commit 9b66d5c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 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: 95c21c4158cc8b5a2920ccbe989b17b6f955d976
refs/heads/master: 810fda9bccc6513856346a9a714cf951d569cd35
16 changes: 8 additions & 8 deletions trunk/drivers/media/dvb/dvb-usb/lmedm04.c
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ static int lme2510_usb_talk(struct dvb_usb_device *d,
int ret = 0;

if (st->usb_buffer == NULL) {
st->usb_buffer = kmalloc(512, GFP_KERNEL);
st->usb_buffer = kmalloc(64, GFP_KERNEL);
if (st->usb_buffer == NULL) {
info("MEM Error no memory");
return -ENOMEM;
Expand All @@ -175,8 +175,8 @@ static int lme2510_usb_talk(struct dvb_usb_device *d,
if (ret < 0)
return -EAGAIN;

/* the read/write capped at 512 */
memcpy(buff, wbuf, (wlen > 512) ? 512 : wlen);
/* the read/write capped at 64 */
memcpy(buff, wbuf, (wlen < 64) ? wlen : 64);

ret |= usb_clear_halt(d->udev, usb_sndbulkpipe(d->udev, 0x01));

Expand All @@ -186,8 +186,8 @@ static int lme2510_usb_talk(struct dvb_usb_device *d,

ret |= usb_clear_halt(d->udev, usb_rcvbulkpipe(d->udev, 0x01));

ret |= lme2510_bulk_read(d->udev, buff, (rlen > 512) ?
512 : rlen , 0x01);
ret |= lme2510_bulk_read(d->udev, buff, (rlen < 64) ?
rlen : 64 , 0x01);

if (rlen > 0)
memcpy(rbuf, buff, rlen);
Expand Down Expand Up @@ -580,7 +580,7 @@ static int lme2510_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
{
struct dvb_usb_device *d = i2c_get_adapdata(adap);
struct lme2510_state *st = d->priv;
static u8 obuf[64], ibuf[512];
static u8 obuf[64], ibuf[64];
int i, read, read_o;
u16 len;
u8 gate = st->i2c_gate;
Expand Down Expand Up @@ -621,7 +621,7 @@ static int lme2510_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
len = msg[i].len+3;
}

if (lme2510_msg(d, obuf, len, ibuf, 512) < 0) {
if (lme2510_msg(d, obuf, len, ibuf, 64) < 0) {
deb_info(1, "i2c transfer failed.");
return -EAGAIN;
}
Expand Down Expand Up @@ -1312,5 +1312,5 @@ module_exit(lme2510_module_exit);

MODULE_AUTHOR("Malcolm Priestley <tvboxspy@gmail.com>");
MODULE_DESCRIPTION("LME2510(C) DVB-S USB2.0");
MODULE_VERSION("1.89");
MODULE_VERSION("1.90");
MODULE_LICENSE("GPL");

0 comments on commit 9b66d5c

Please sign in to comment.