Skip to content

Commit

Permalink
[media] av7110: don't allow negative volumes
Browse files Browse the repository at this point in the history
The issue here is that we there is a static checker warning because we
have a user controlled volume setting and we cap the upper bound but we
allow negative numbers.  Negative volumes don't make sense, so let's
make these variables unsigned.

Signed-off-by: Dan Carpenter <[email protected]>
Signed-off-by: Hans Verkuil <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
  • Loading branch information
Dan Carpenter authored and mchehab committed Nov 17, 2015
1 parent 4623e59 commit 75d63a4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
6 changes: 4 additions & 2 deletions drivers/media/pci/ttpci/av7110_av.c
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,11 @@ int av7110_pes_play(void *dest, struct dvb_ringbuffer *buf, int dlen)
}


int av7110_set_volume(struct av7110 *av7110, int volleft, int volright)
int av7110_set_volume(struct av7110 *av7110, unsigned int volleft,
unsigned int volright)
{
int err, vol, val, balance = 0;
unsigned int vol, val, balance = 0;
int err;

dprintk(2, "av7110:%p, \n", av7110);

Expand Down
3 changes: 2 additions & 1 deletion drivers/media/pci/ttpci/av7110_av.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ extern int av7110_record_cb(struct dvb_filter_pes2ts *p2t, u8 *buf, size_t len);
extern int av7110_pes_play(void *dest, struct dvb_ringbuffer *buf, int dlen);
extern int av7110_write_to_decoder(struct dvb_demux_feed *feed, const u8 *buf, size_t len);

extern int av7110_set_volume(struct av7110 *av7110, int volleft, int volright);
extern int av7110_set_volume(struct av7110 *av7110, unsigned int volleft,
unsigned int volright);
extern int av7110_av_stop(struct av7110 *av7110, int av);
extern int av7110_av_start_record(struct av7110 *av7110, int av,
struct dvb_demux_feed *dvbdmxfeed);
Expand Down

0 comments on commit 75d63a4

Please sign in to comment.