diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/ide/ide-floppy.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/ide/ide-floppy.c')
| -rw-r--r-- | drivers/ide/ide-floppy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 5406b6ea3ad..5a702d02c84 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
| @@ -107,7 +107,7 @@ static int ide_floppy_callback(ide_drive_t *drive, int dsc) | |||
| 107 | static void ide_floppy_report_error(struct ide_disk_obj *floppy, | 107 | static void ide_floppy_report_error(struct ide_disk_obj *floppy, |
| 108 | struct ide_atapi_pc *pc) | 108 | struct ide_atapi_pc *pc) |
| 109 | { | 109 | { |
| 110 | /* supress error messages resulting from Medium not present */ | 110 | /* suppress error messages resulting from Medium not present */ |
| 111 | if (floppy->sense_key == 0x02 && | 111 | if (floppy->sense_key == 0x02 && |
| 112 | floppy->asc == 0x3a && | 112 | floppy->asc == 0x3a && |
| 113 | floppy->ascq == 0x00) | 113 | floppy->ascq == 0x00) |