Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 353c2129 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mauro Carvalho Chehab
Browse files

[media] V4L: omap1_camera: join split format lines 



Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a48be1d6

drivers/media/video/omap1_camera.c

+31 −31
Original line number Diff line number Diff line
@@ -811,8 +811,8 @@ static irqreturn_t cam_isr(int irq, void *data) 
	spin_lock_irqsave(&pcdev->lock, flags);



	if (WARN_ON(!buf)) {

		dev_warn(dev, "%s: unhandled camera interrupt, status == "

				"%#x\n", __func__, it_status);

		dev_warn(dev, "%s: unhandled camera interrupt, status == %#x\n",

			 __func__, it_status);

		suspend_capture(pcdev);

		disable_capture(pcdev);

		goto out;
@@ -1088,15 +1088,15 @@ static int omap1_cam_get_formats(struct soc_camera_device *icd, 
			xlate->host_fmt	= &omap1_cam_formats[code];

			xlate->code	= code;

			xlate++;

			dev_dbg(dev, "%s: providing format %s "

					"as byte swapped code #%d\n", __func__,

					omap1_cam_formats[code].name, code);

			dev_dbg(dev,

				"%s: providing format %s as byte swapped code #%d\n",

				__func__, omap1_cam_formats[code].name, code);

		}

	default:

		if (xlate)

			dev_dbg(dev, "%s: providing format %s "

					"in pass-through mode\n", __func__,

					fmt->name);

			dev_dbg(dev,

				"%s: providing format %s in pass-through mode\n",

				__func__, fmt->name);

	}

	formats++;

	if (xlate) {
@@ -1155,8 +1155,8 @@ static int dma_align(int *width, int *height, 
										     \

	if (sense.flags & SOCAM_SENSE_PCLK_CHANGED) {				     \

		if (sense.pixel_clock > sense.pixel_clock_max) {		     \

			dev_err(dev, "%s: pixel clock %lu "		   \

					"set by the camera too high!\n",   \

			dev_err(dev,						     \

				"%s: pixel clock %lu set by the camera too high!\n", \

				__func__, sense.pixel_clock);			     \

			__ret = -EINVAL;					     \

		}								     \