Browse Source

Merge remote-tracking branch 'spi/fix/clps711x' into spi-devm

Mark Brown 12 years ago
parent
commit
13e92b5b1e
1 changed files with 0 additions and 2 deletions
  1. 0 2
      drivers/spi/spi-clps711x.c

+ 0 - 2
drivers/spi/spi-clps711x.c

@@ -247,7 +247,6 @@ err_out:
 			gpio_free(hw->chipselect[i]);
 
 	spi_master_put(master);
-	kfree(master);
 
 	return ret;
 }
@@ -263,7 +262,6 @@ static int spi_clps711x_remove(struct platform_device *pdev)
 			gpio_free(hw->chipselect[i]);
 
 	spi_unregister_master(master);
-	kfree(master);
 
 	return 0;
 }