Skip to contentSkip to conversation

drivers: media: i2c : s5c73m3: Replace dev_err with pr_err

PATCH In review Tapasweni Pathak 2 participants 2 messages Feb 24, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers: media: i2c : s5c73m3: Replace dev_err with pr_err

Replace dev_err statement with pr_err to fix null dereference.

Found by Coccinelle.

---
 drivers/media/i2c/s5c73m3/s5c73m3-spi.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/s5c73m3/s5c73m3-spi.c +1 -1
index f60b265..63eb190 100644
@@ -52,7 +52,7 @@ static int spi_xmit(struct spi_device *spi_dev, void *addr, const int len,
 		xfer.rx_buf = addr;
 
 	if (spi_dev == NULL) {
-		dev_err(&spi_dev->dev, "SPI device is uninitialized\n");
+		pr_err("SPI device is uninitialized\n");
 		return -ENODEV;
 	}
 

--
1.7.9.5

#1 lore raw
Quoted 14 lines · Tapasweni Pathak

Replace dev_err statement with pr_err to fix null dereference.

Found by Coccinelle.

---
 drivers/media/i2c/s5c73m3/s5c73m3-spi.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/s5c73m3/s5c73m3-spi.c +0 -0
index f60b265..63eb190 100644

drivers/media/i2c/s5c73m3/s5c73m3-spi.c static int spi_xmit(struct spi_device *spi_dev, void *addr, const int len, · line 57

Quoted 7 lines
drivers/media/i2c/s5c73m3/s5c73m3-spi.c +1 -1
@@ -52,7 +52,7 @@ static int spi_xmit(struct spi_device *spi_dev, void *addr, const int len,
 		xfer.rx_buf = addr;
 
 	if (spi_dev == NULL) {
-		dev_err(&spi_dev->dev, "SPI device is uninitialized\n");
+		pr_err("SPI device is uninitialized\n");
 		return -ENODEV;
 	}

It'd be better to move this above the if (dir...) block and use ratelimit/once it too

static int spi_xmit(struct spi_device *spi_dev, void *addr, const int len,
enum spi_direction dir)

{
	struct spi_message msg;
	int r;
	struct spi_transfer xfer = {
		.len	= len,
	};

	if (!spi_dev) {
		pr_err_once("SPI device is uninitialized\n");
		return -ENODEV;
	}

	if (dir == SPI_DIR_TX)
		xfer.tx_buf = addr;
	else
		xfer.rx_buf = addr;

	...