diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2011-08-25 09:43:49 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-09-06 14:39:10 -0300 |
| commit | eb70ac1b1e457537a056cb714ccddbb1fd56f9ed (patch) | |
| tree | ad599b0b767cbefd1f08d75a382c237c63d3726f /drivers/media/radio/wl128x | |
| parent | f68afe5d45198bfe7040cf751033c6208577468c (diff) | |
| download | blackbird-op-linux-eb70ac1b1e457537a056cb714ccddbb1fd56f9ed.tar.gz blackbird-op-linux-eb70ac1b1e457537a056cb714ccddbb1fd56f9ed.zip | |
[media] wl128x: fix compiler warning + wrong write() return
The fix is to check for ret and return -EFAULT if non-zero.
I also noticed that write() didn't return the number of bytes written.
Fixed as well.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/radio/wl128x')
| -rw-r--r-- | drivers/media/radio/wl128x/fmdrv_v4l2.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/radio/wl128x/fmdrv_v4l2.c b/drivers/media/radio/wl128x/fmdrv_v4l2.c index 8c0e19276970..478d1e93ada6 100644 --- a/drivers/media/radio/wl128x/fmdrv_v4l2.c +++ b/drivers/media/radio/wl128x/fmdrv_v4l2.c @@ -84,12 +84,14 @@ static ssize_t fm_v4l2_fops_write(struct file *file, const char __user * buf, ret = copy_from_user(&rds, buf, sizeof(rds)); fmdbg("(%d)type: %d, text %s, af %d\n", ret, rds.text_type, rds.text, rds.af_freq); + if (ret) + return -EFAULT; fmdev = video_drvdata(file); fm_tx_set_radio_text(fmdev, rds.text, rds.text_type); fm_tx_set_af(fmdev, rds.af_freq); - return 0; + return sizeof(rds); } static u32 fm_v4l2_fops_poll(struct file *file, struct poll_table_struct *pts) |
