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

Commit dbecebca authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: fix sparse warning about shadowing 'flags' symbol 



drivers/ide/ide.c:801:18: warning: symbol 'flags' shadows an earlier one
drivers/ide/ide.c:732:16: originally declared here

Also fix some whitespace damage while at it.

Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent bcd88ac3

drivers/ide/ide.c

+5 −8
Original line number Diff line number Diff line
@@ -1031,9 +1031,8 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device 
			drive->nice1 = (arg >> IDE_NICE_1) & 1;

			return 0;

		case HDIO_DRIVE_RESET:

		{

			unsigned long flags;

			if (!capable(CAP_SYS_ADMIN)) return -EACCES;

			if (!capable(CAP_SYS_ADMIN))

				return -EACCES;



			/*

			 *	Abort the current command on the
@@ -1062,8 +1061,6 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device 
			(void) ide_do_reset(drive);



			return 0;

		}



		case HDIO_GET_BUSSTATE:

			if (!capable(CAP_SYS_ADMIN))

				return -EACCES;