* [PATCH] staging: Replaced BUG_ON with warnings
@ 2016-12-03 7:02 Shilpa Puttegowda
2016-12-03 7:06 ` Allen
0 siblings, 1 reply; 2+ messages in thread
From: Shilpa Puttegowda @ 2016-12-03 7:02 UTC (permalink / raw)
To: linux-kernel, Greg Kroah-Hartman; +Cc: linux-media, Shilpa P
From: Shilpa P <shilpapri@gmail.com>
Don't crash the Kernel for driver errors
Signed-off-by: Shilpa P <shilpapri@gmail.com>
---
drivers/staging/media/bcm2048/radio-bcm2048.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/media/bcm2048/radio-bcm2048.c b/drivers/staging/media/bcm2048/radio-bcm2048.c
index 4d9bd02..05f5918 100644
--- a/drivers/staging/media/bcm2048/radio-bcm2048.c
+++ b/drivers/staging/media/bcm2048/radio-bcm2048.c
@@ -1538,7 +1538,11 @@ static int bcm2048_parse_rt_match_c(struct bcm2048_device *bdev, int i,
if (crc == BCM2048_RDS_CRC_UNRECOVARABLE)
return 0;
- BUG_ON((index+2) >= BCM2048_MAX_RDS_RT);
+ if ((index + 2) >= BCM2048_MAX_RDS_RT) {
+ dev_err(&bdev->client->dev,
+ "Incorrect index = %d\n", index);
+ return 0;
+ }
if ((bdev->rds_info.radio_text[i] & BCM2048_RDS_BLOCK_MASK) ==
BCM2048_RDS_BLOCK_C) {
@@ -1561,7 +1565,11 @@ static void bcm2048_parse_rt_match_d(struct bcm2048_device *bdev, int i,
if (crc == BCM2048_RDS_CRC_UNRECOVARABLE)
return;
- BUG_ON((index+4) >= BCM2048_MAX_RDS_RT);
+ if ((index + 4) >= BCM2048_MAX_RDS_RT) {
+ dev_err(&bdev->client->dev,
+ "Incorrect index = %d\n", index);
+ return;
+ }
if ((bdev->rds_info.radio_text[i] & BCM2048_RDS_BLOCK_MASK) ==
BCM2048_RDS_BLOCK_D)
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] staging: Replaced BUG_ON with warnings
2016-12-03 7:02 [PATCH] staging: Replaced BUG_ON with warnings Shilpa Puttegowda
@ 2016-12-03 7:06 ` Allen
0 siblings, 0 replies; 2+ messages in thread
From: Allen @ 2016-12-03 7:06 UTC (permalink / raw)
To: Shilpa Puttegowda; +Cc: linux-kernel, Greg Kroah-Hartman, linux-media
On Sat, Dec 3, 2016 at 12:32 PM, Shilpa Puttegowda <shilpapri@gmail.com> wrote:
> From: Shilpa P <shilpapri@gmail.com>
>
> Don't crash the Kernel for driver errors
>
> Signed-off-by: Shilpa P <shilpapri@gmail.com>
> ---
> drivers/staging/media/bcm2048/radio-bcm2048.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
Acked-by: Allen Pais <allen.lkml@gmail.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-12-03 7:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-03 7:02 [PATCH] staging: Replaced BUG_ON with warnings Shilpa Puttegowda
2016-12-03 7:06 ` Allen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).