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

Commit 89952d13 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] misc NULL noise 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0ae24bde

arch/x86_64/kernel/vsyscall.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -112,7 +112,7 @@ static __always_inline void do_vgettimeofday(struct timeval * tv) 




		vread = __vsyscall_gtod_data.clock.vread;

		vread = __vsyscall_gtod_data.clock.vread;

		if (unlikely(!__vsyscall_gtod_data.sysctl_enabled || !vread)) {

		if (unlikely(!__vsyscall_gtod_data.sysctl_enabled || !vread)) {

			gettimeofday(tv,0);

			gettimeofday(tv,NULL);

			return;

			return;

		}

		}

		now = vread();

		now = vread();

drivers/acpi/events/evmisc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -549,7 +549,7 @@ acpi_status acpi_ev_release_global_lock(void) 
	acpi_gbl_global_lock_acquired = FALSE;

	acpi_gbl_global_lock_acquired = FALSE;





	/* Release the local GL mutex */

	/* Release the local GL mutex */

	acpi_ev_global_lock_thread_id = 0;

	acpi_ev_global_lock_thread_id = NULL;

	acpi_ev_global_lock_acquired = 0;

	acpi_ev_global_lock_acquired = 0;

	acpi_os_release_mutex(acpi_gbl_global_lock_mutex);

	acpi_os_release_mutex(acpi_gbl_global_lock_mutex);

	return_ACPI_STATUS(status);

	return_ACPI_STATUS(status);

drivers/ata/pata_mpc52xx.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -329,7 +329,7 @@ mpc52xx_ata_init_one(struct device *dev, struct mpc52xx_ata_priv *priv) 
	ae->dev = dev;

	ae->dev = dev;

	ae->irq = priv->ata_irq;

	ae->irq = priv->ata_irq;





	aio->cmd_addr		= 0;	/* Don't have a classic reg block */

	aio->cmd_addr		= NULL;	/* Don't have a classic reg block */

	aio->altstatus_addr	= &priv->ata_regs->tf_control;

	aio->altstatus_addr	= &priv->ata_regs->tf_control;

	aio->ctl_addr		= &priv->ata_regs->tf_control;

	aio->ctl_addr		= &priv->ata_regs->tf_control;

	aio->data_addr		= &priv->ata_regs->tf_data;

	aio->data_addr		= &priv->ata_regs->tf_data;

drivers/char/watchdog/machzwd.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -324,7 +324,7 @@ static int zf_ioctl(struct inode *inode, struct file *file, unsigned int cmd, 
			return put_user(0, p);

			return put_user(0, p);





		case WDIOC_KEEPALIVE:

		case WDIOC_KEEPALIVE:

			zf_ping(0);

			zf_ping(NULL);

			break;

			break;





		default:

		default:

drivers/media/video/pvrusb2/pvrusb2-hdw.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1248,10 +1248,10 @@ int pvr2_upload_firmware2(struct pvr2_hdw *hdw) 
	ret |= pvr2_write_register(hdw, 0xaa18, 0x00840000); /*unknown*/

	ret |= pvr2_write_register(hdw, 0xaa18, 0x00840000); /*unknown*/

	LOCK_TAKE(hdw->ctl_lock); do {

	LOCK_TAKE(hdw->ctl_lock); do {

		hdw->cmd_buffer[0] = FX2CMD_FWPOST1;

		hdw->cmd_buffer[0] = FX2CMD_FWPOST1;

		ret |= pvr2_send_request(hdw,hdw->cmd_buffer,1,0,0);

		ret |= pvr2_send_request(hdw,hdw->cmd_buffer,1,NULL,0);

		hdw->cmd_buffer[0] = FX2CMD_MEMSEL;

		hdw->cmd_buffer[0] = FX2CMD_MEMSEL;

		hdw->cmd_buffer[1] = 0;

		hdw->cmd_buffer[1] = 0;

		ret |= pvr2_send_request(hdw,hdw->cmd_buffer,2,0,0);

		ret |= pvr2_send_request(hdw,hdw->cmd_buffer,2,NULL,0);

	} while (0); LOCK_GIVE(hdw->ctl_lock);

	} while (0); LOCK_GIVE(hdw->ctl_lock);





	if (ret) {

	if (ret) {
@@ -1320,7 +1320,7 @@ int pvr2_upload_firmware2(struct pvr2_hdw *hdw) 
	LOCK_TAKE(hdw->ctl_lock); do {

	LOCK_TAKE(hdw->ctl_lock); do {

		hdw->cmd_buffer[0] = FX2CMD_MEMSEL;

		hdw->cmd_buffer[0] = FX2CMD_MEMSEL;

		hdw->cmd_buffer[1] = 0;

		hdw->cmd_buffer[1] = 0;

		ret |= pvr2_send_request(hdw,hdw->cmd_buffer,2,0,0);

		ret |= pvr2_send_request(hdw,hdw->cmd_buffer,2,NULL,0);

	} while (0); LOCK_GIVE(hdw->ctl_lock);

	} while (0); LOCK_GIVE(hdw->ctl_lock);





	if (ret) {

	if (ret) {