From ea6e533d9ff900eacb521cbf0ea90f8d97ac119b Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Thu, 18 Feb 2010 01:54:00 +0100 Subject: [PATCH] --- yaml --- r: 185100 b: refs/heads/master c: 58aaa5427663b680030aa58aaaf1e2738564b8dc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/firewire/core-device.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2cc8555f8feb..8f391035879d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2799d5c5f9d2064c6d1f50ec82e28e3eac5f6954 +refs/heads/master: 58aaa5427663b680030aa58aaaf1e2738564b8dc diff --git a/trunk/drivers/firewire/core-device.c b/trunk/drivers/firewire/core-device.c index 01cb6a327e29..150a8ba97488 100644 --- a/trunk/drivers/firewire/core-device.c +++ b/trunk/drivers/firewire/core-device.c @@ -493,7 +493,6 @@ static int read_rom(struct fw_device *device, } #define READ_BIB_ROM_SIZE 256 -#define READ_BIB_STACK_SIZE 16 /* * Read the bus info block, perform a speed probe, and read all of the rest of @@ -510,7 +509,7 @@ static int read_bus_info_block(struct fw_device *device, int generation) int i, end, length, ret = -1; rom = kmalloc(sizeof(*rom) * READ_BIB_ROM_SIZE + - sizeof(*stack) * READ_BIB_STACK_SIZE, GFP_KERNEL); + sizeof(*stack) * READ_BIB_ROM_SIZE, GFP_KERNEL); if (rom == NULL) return -ENOMEM; @@ -612,8 +611,7 @@ static int read_bus_info_block(struct fw_device *device, int generation) RCODE_COMPLETE) goto out; - if ((key >> 30) != 3 || (rom[i] >> 30) < 2 || - sp >= READ_BIB_STACK_SIZE) + if ((key >> 30) != 3 || (rom[i] >> 30) < 2) continue; /* * Offset points outside the ROM. May be a firmware