Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index ef4a731ca5c2..78c2511ae9e0 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -437,7 +437,7 @@ static int __devinit m25p_probe(struct spi_device *spi)
                  * or JEDEC get-id commands.  Try them ...
                  */
                 DEBUG(MTD_DEBUG_LEVEL1, "%s: no chip id\n",
-                                flash->spi->dev.bus_id);
+                                spi->dev.bus_id);
                 return -ENODEV;
         }
 
@@ -447,11 +447,11 @@ static int __devinit m25p_probe(struct spi_device *spi)
         }
         if (i == ARRAY_SIZE(m25p_data)) {
                 DEBUG(MTD_DEBUG_LEVEL1, "%s: unrecognized id %s\n",
-                                flash->spi->dev.bus_id, data->type);
+                                spi->dev.bus_id, data->type);
                 return -ENODEV;
         }
 
-        flash = kzalloc(sizeof *flash, SLAB_KERNEL);
+        flash = kzalloc(sizeof *flash, GFP_KERNEL);
         if (!flash)
                 return -ENOMEM;