[PATCH 1/2] ATA: sata_promise, do not freeze ports

[PATCH 1/2] ATA: sata_promise, do not freeze ports

[Jiri Slaby]

If no objections, here comes the revert of the return 1 issue.

--

sata_promise, do not freeze ports

revert return 1 thing in the error isr, that causes port freezing, so that the
system is unusable when exception is thrown.

See http://lkml.org/lkml/2007/4/30/268

Cc: Jeff Garzik <jgarzik@pobox.com>
Cc: Mikael Pettersson <mikpe@it.uu.se>
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>

---
commit a38d21f4b5d5029b0b083fe2651e78c7657fda3b
tree 0a2019a34227906bc5fb0e60d90cc7f4759ee934
parent b5c1fc64195b18d3919bfa7dddfb76e9f2a05786
author Jiri Slaby <jirislaby@gmail.com> Sat, 05 May 2007 16:43:22 +0200
committer Jiri Slaby <jirislaby@gmail.com> Sat, 05 May 2007 16:43:22 +0200

 drivers/ata/sata_promise.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
index f56549b..a0024ae 100644
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -668,10 +668,8 @@ static inline unsigned int pdc_host_intr( struct ata_port *ap,
 	else
 		err_mask &= ~PDC2_ERR_MASK;
 	port_status = readl(port_mmio + PDC_GLOBAL_CTL);
-	if (unlikely(port_status & err_mask)) {
+	if (unlikely(port_status & err_mask))
 		pdc_error_intr(ap, qc, port_status, err_mask);
-		return 1;
-	}
 
 	switch (qc->tf.protocol) {
 	case ATA_PROT_DMA:

[PATCH 2/2] V4L2: videodev, allow debugging

[Jiri Slaby]

videodev, allow debugging

fix typo? in videodev.c to allow debugging

Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>

---
commit 94b6ccaf1ca50632014202d3eeb99a0e23185ddb
tree 55e2ac37ca4e12846d851b863b620b154e9df500
parent a38d21f4b5d5029b0b083fe2651e78c7657fda3b
author Jiri Slaby <jirislaby@gmail.com> Sat, 05 May 2007 16:44:18 +0200
committer Jiri Slaby <jirislaby@gmail.com> Sat, 05 May 2007 16:44:18 +0200

 drivers/media/video/videodev.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index 5263b50..a3cef80 100644
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -433,7 +433,7 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
 	int                  ret = -EINVAL;
 
 	if ( (vfd->debug & V4L2_DEBUG_IOCTL) &&
-				!(vfd->debug | V4L2_DEBUG_IOCTL_ARG)) {
+				!(vfd->debug & V4L2_DEBUG_IOCTL_ARG)) {
 		v4l_print_ioctl(vfd->name, cmd);
 	}