diff options
Diffstat (limited to 'kernel/drivers/media/radio/wl128x')
| -rw-r--r-- | kernel/drivers/media/radio/wl128x/Kconfig | 4 | ||||
| -rw-r--r-- | kernel/drivers/media/radio/wl128x/fmdrv.h | 2 | ||||
| -rw-r--r-- | kernel/drivers/media/radio/wl128x/fmdrv_common.c | 5 |
3 files changed, 4 insertions, 7 deletions
diff --git a/kernel/drivers/media/radio/wl128x/Kconfig b/kernel/drivers/media/radio/wl128x/Kconfig index 9d6574beb..c9e349b16 100644 --- a/kernel/drivers/media/radio/wl128x/Kconfig +++ b/kernel/drivers/media/radio/wl128x/Kconfig @@ -4,8 +4,8 @@ menu "Texas Instruments WL128x FM driver (ST based)" config RADIO_WL128X tristate "Texas Instruments WL128x FM Radio" - depends on VIDEO_V4L2 && RFKILL && GPIOLIB && TTY - depends on TI_ST + depends on VIDEO_V4L2 && RFKILL && TTY && TI_ST + depends on GPIOLIB || COMPILE_TEST help Choose Y here if you have this FM radio chip. diff --git a/kernel/drivers/media/radio/wl128x/fmdrv.h b/kernel/drivers/media/radio/wl128x/fmdrv.h index a587c9bac..dd203de5d 100644 --- a/kernel/drivers/media/radio/wl128x/fmdrv.h +++ b/kernel/drivers/media/radio/wl128x/fmdrv.h @@ -210,7 +210,7 @@ struct fmdev { spinlock_t resp_skb_lock; /* To protect access to received SKB */ long flag; /* FM driver state machine info */ - u8 streg_cbdata; /* status of ST registration */ + int streg_cbdata; /* status of ST registration */ struct sk_buff_head rx_q; /* RX queue */ struct tasklet_struct rx_task; /* RX Tasklet */ diff --git a/kernel/drivers/media/radio/wl128x/fmdrv_common.c b/kernel/drivers/media/radio/wl128x/fmdrv_common.c index 704397f3c..ebc73b034 100644 --- a/kernel/drivers/media/radio/wl128x/fmdrv_common.c +++ b/kernel/drivers/media/radio/wl128x/fmdrv_common.c @@ -689,7 +689,6 @@ static void fm_rx_update_af_cache(struct fmdev *fmdev, u8 af) static void fm_rdsparse_swapbytes(struct fmdev *fmdev, struct fm_rdsdata_format *rds_format) { - u8 byte1; u8 index = 0; u8 *rds_buff; @@ -701,9 +700,7 @@ static void fm_rdsparse_swapbytes(struct fmdev *fmdev, if (fmdev->asci_id != 0x6350) { rds_buff = &rds_format->data.groupdatabuff.buff[0]; while (index + 1 < FM_RX_RDS_INFO_FIELD_MAX) { - byte1 = rds_buff[index]; - rds_buff[index] = rds_buff[index + 1]; - rds_buff[index + 1] = byte1; + swap(rds_buff[index], rds_buff[index + 1]); index += 2; } } |