GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-26 08:31:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ide: fix sparse warning about shadowing 'flags' symbol

Browse source 
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: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2008-02-26 21:50:35 +01:00
parent bcd88ac3b2
commit dbecebca19
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
drivers/ide/ide.c
View file

@ -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; drive->nice1 = (arg >> IDE_NICE_1) & 1;
return 0; return 0;
case HDIO_DRIVE_RESET: case HDIO_DRIVE_RESET:
{ if (!capable(CAP_SYS_ADMIN))
unsigned long flags; return -EACCES;
if (!capable(CAP_SYS_ADMIN)) return -EACCES;
/* /*
* Abort the current command on the * 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); (void) ide_do_reset(drive);
return 0; return 0;
}
case HDIO_GET_BUSSTATE: case HDIO_GET_BUSSTATE:
if (!capable(CAP_SYS_ADMIN)) if (!capable(CAP_SYS_ADMIN))
return -EACCES; return -EACCES;